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

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

drivers/char/hw_random/omap3-rom-rng.c

+16 −26
Original line number Diff line number Diff line
@@ -100,6 +100,14 @@ static int omap_rom_rng_runtime_resume(struct device *dev) 
	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)

{

	struct omap_rom_rng *ddata;
@@ -133,33 +141,16 @@ static int omap3_rom_rng_probe(struct platform_device *pdev) 
		return PTR_ERR(ddata->clk);

	}



	pm_runtime_enable(ddata->dev);



	ret = hwrng_register(&ddata->ops);

	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);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, 500);

	pm_runtime_use_autosuspend(&pdev->dev);



	ret = devm_add_action_or_reset(ddata->dev, omap_rom_rng_finish,

				       ddata);

	if (ret)

		return ret;

}



static int omap3_rom_rng_remove(struct platform_device *pdev)

{

	struct omap_rom_rng *ddata;



	ddata = dev_get_drvdata(&pdev->dev);

	hwrng_unregister(&ddata->ops);

	pm_runtime_dont_use_autosuspend(ddata->dev);

	pm_runtime_disable(ddata->dev);



	return 0;

	return devm_hwrng_register(ddata->dev, &ddata->ops);

}



static const struct of_device_id omap_rom_rng_match[] = {
@@ -180,7 +171,6 @@ static struct platform_driver omap3_rom_rng_driver = { 
		.pm = &omap_rom_rng_pm_ops,

	},

	.probe		= omap3_rom_rng_probe,

	.remove		= omap3_rom_rng_remove,

};



module_platform_driver(omap3_rom_rng_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE