Commit 55a66f91 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Herbert Xu
Browse files

hwrng: meson - use devm_clk_get_optional_enabled 



Use devm_clk_get_optional_enabled() to simplify the code.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b521d0a1

drivers/char/hw_random/meson-rng.c

+4 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
struct meson_rng_data {

	void __iomem *base;

	struct hwrng rng;

	struct clk *core_clk;

};



static int meson_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
@@ -32,16 +31,11 @@ static int meson_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) 
	return sizeof(u32);

}



static void meson_rng_clk_disable(void *data)

{

	clk_disable_unprepare(data);

}



static int meson_rng_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct meson_rng_data *data;

	int ret;

	struct clk *core_clk;



	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);

	if (!data)
@@ -51,21 +45,11 @@ static int meson_rng_probe(struct platform_device *pdev) 
	if (IS_ERR(data->base))

		return PTR_ERR(data->base);



	data->core_clk = devm_clk_get_optional(dev, "core");

	if (IS_ERR(data->core_clk))

		return dev_err_probe(dev, PTR_ERR(data->core_clk),

	core_clk = devm_clk_get_optional_enabled(dev, "core");

	if (IS_ERR(core_clk))

		return dev_err_probe(dev, PTR_ERR(core_clk),

				     "Failed to get core clock\n");



	if (data->core_clk) {

		ret = clk_prepare_enable(data->core_clk);

		if (ret)

			return ret;

		ret = devm_add_action_or_reset(dev, meson_rng_clk_disable,

					       data->core_clk);

		if (ret)

			return ret;

	}



	data->rng.name = pdev->name;

	data->rng.read = meson_rng_read;