UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Heiner Kallweit 2023-02-18 21:56:39 +01:00 committed by Herbert Xu
parent b521d0a183
commit 55a66f91b2
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/char/hw_random/meson-rng.c
View File

@ -19,7 +19,6 @@
struct meson_rng_data { struct meson_rng_data {
void __iomem *base; void __iomem *base;
struct hwrng rng; struct hwrng rng;
struct clk *core_clk;
}; };
static int meson_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) 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); return sizeof(u32);
} }
static void meson_rng_clk_disable(void *data)
{
clk_disable_unprepare(data);
}
static int meson_rng_probe(struct platform_device *pdev) static int meson_rng_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct meson_rng_data *data; struct meson_rng_data *data;
int ret; struct clk *core_clk;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
@ -51,21 +45,11 @@ static int meson_rng_probe(struct platform_device *pdev)
if (IS_ERR(data->base)) if (IS_ERR(data->base))
return PTR_ERR(data->base); return PTR_ERR(data->base);
data->core_clk = devm_clk_get_optional(dev, "core"); core_clk = devm_clk_get_optional_enabled(dev, "core");
if (IS_ERR(data->core_clk)) if (IS_ERR(core_clk))
return dev_err_probe(dev, PTR_ERR(data->core_clk), return dev_err_probe(dev, PTR_ERR(core_clk),
"Failed to get core clock\n"); "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.name = pdev->name;
data->rng.read = meson_rng_read; data->rng.read = meson_rng_read;