hwrng: meson - use devm_clk_get_optional_enabled

Use devm_clk_get_optional_enabled() to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/meson-rng.c b/drivers/char/hw_random/meson-rng.c
index e79069b6d05094f590d4283a88a430e306ea9207..22e3dcc6f650942a8f1cda3cf24c5dff9f5b22fb 100644 (file)
--- a/drivers/char/hw_random/meson-rng.c
+++ b/drivers/char/hw_random/meson-rng.c
@@ -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;