Commit bac5c49e authored by Tony Lindgren's avatar Tony Lindgren Committed by Herbert Xu

hwrng: omap3-rom - Use devm hwrng and runtime PM

This allows us to simplify things more for probe and exit.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Adam Ford <aford173@gmail.com>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Tero Kristo <t-kristo@ti.com>
Suggested-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8d9d4bdc
...@@ -100,6 +100,14 @@ static int omap_rom_rng_runtime_resume(struct device *dev) ...@@ -100,6 +100,14 @@ static int omap_rom_rng_runtime_resume(struct device *dev)
return 0; return 0;
} }
static void omap_rom_rng_finish(void *data)
{
struct omap_rom_rng *ddata = data;
pm_runtime_dont_use_autosuspend(ddata->dev);
pm_runtime_disable(ddata->dev);
}
static int omap3_rom_rng_probe(struct platform_device *pdev) static int omap3_rom_rng_probe(struct platform_device *pdev)
{ {
struct omap_rom_rng *ddata; struct omap_rom_rng *ddata;
...@@ -133,33 +141,16 @@ static int omap3_rom_rng_probe(struct platform_device *pdev) ...@@ -133,33 +141,16 @@ static int omap3_rom_rng_probe(struct platform_device *pdev)
return PTR_ERR(ddata->clk); return PTR_ERR(ddata->clk);
} }
pm_runtime_enable(ddata->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, 500);
ret = hwrng_register(&ddata->ops); pm_runtime_use_autosuspend(&pdev->dev);
if (!ret)
goto err_disable;
pm_runtime_set_autosuspend_delay(ddata->dev, 500);
pm_runtime_use_autosuspend(ddata->dev);
return 0;
err_disable:
pm_runtime_disable(ddata->dev);
return ret;
}
static int omap3_rom_rng_remove(struct platform_device *pdev)
{
struct omap_rom_rng *ddata;
ddata = dev_get_drvdata(&pdev->dev); ret = devm_add_action_or_reset(ddata->dev, omap_rom_rng_finish,
hwrng_unregister(&ddata->ops); ddata);
pm_runtime_dont_use_autosuspend(ddata->dev); if (ret)
pm_runtime_disable(ddata->dev); return ret;
return 0; return devm_hwrng_register(ddata->dev, &ddata->ops);
} }
static const struct of_device_id omap_rom_rng_match[] = { static const struct of_device_id omap_rom_rng_match[] = {
...@@ -180,7 +171,6 @@ static struct platform_driver omap3_rom_rng_driver = { ...@@ -180,7 +171,6 @@ static struct platform_driver omap3_rom_rng_driver = {
.pm = &omap_rom_rng_pm_ops, .pm = &omap_rom_rng_pm_ops,
}, },
.probe = omap3_rom_rng_probe, .probe = omap3_rom_rng_probe,
.remove = omap3_rom_rng_remove,
}; };
module_platform_driver(omap3_rom_rng_driver); module_platform_driver(omap3_rom_rng_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment