leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwrng: drivers - Use device-managed registration API

Browse Source 
Use devm_hwrng_register to simplify the implementation.
Manual unregistration and some remove functions can be
removed now.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Acked-by: Łukasz Stelmach <l.stelmach@samsung.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Chuhong Yuan 2019-07-25 16:01:55 +08:00 committed by Herbert Xu
parent dec0fb3946
commit 3e75241be8
9 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/hw_random/atmel-rng.c
View File

@ -86,7 +86,7 @@ static int atmel_trng_probe(struct platform_device *pdev)
trng->rng.name = pdev->name; trng->rng.name = pdev->name;
trng->rng.read = atmel_trng_read; trng->rng.read = atmel_trng_read;
ret = hwrng_register(&trng->rng); ret = devm_hwrng_register(&pdev->dev, &trng->rng);
if (ret) if (ret)
goto err_register; goto err_register;
@ -103,7 +103,6 @@ static int atmel_trng_remove(struct platform_device *pdev)
{ {
struct atmel_trng *trng = platform_get_drvdata(pdev); struct atmel_trng *trng = platform_get_drvdata(pdev);
hwrng_unregister(&trng->rng);
atmel_trng_disable(trng); atmel_trng_disable(trng);
clk_disable_unprepare(trng->clk); clk_disable_unprepare(trng->clk);

11
drivers/char/hw_random/cavium-rng-vf.c
View File

@ -67,7 +67,7 @@ static int cavium_rng_probe_vf(struct pci_dev *pdev,
pci_set_drvdata(pdev, rng); pci_set_drvdata(pdev, rng);
ret = hwrng_register(&rng->ops); ret = devm_hwrng_register(&pdev->dev, &rng->ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Error registering device as HWRNG.\n"); dev_err(&pdev->dev, "Error registering device as HWRNG.\n");
return ret; return ret;
@ -76,14 +76,6 @@ static int cavium_rng_probe_vf(struct pci_dev *pdev,
return 0; return 0;
} }
/* Remove the VF */
static void cavium_rng_remove_vf(struct pci_dev *pdev)
{
struct cavium_rng *rng;
rng = pci_get_drvdata(pdev);
hwrng_unregister(&rng->ops);
}
static const struct pci_device_id cavium_rng_vf_id_table[] = { static const struct pci_device_id cavium_rng_vf_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, 0xa033), 0, 0, 0}, { PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, 0xa033), 0, 0, 0},
@ -95,7 +87,6 @@ static struct pci_driver cavium_rng_vf_driver = {
.name = "cavium_rng_vf", .name = "cavium_rng_vf",
.id_table = cavium_rng_vf_id_table, .id_table = cavium_rng_vf_id_table,
.probe = cavium_rng_probe_vf, .probe = cavium_rng_probe_vf,
.remove = cavium_rng_remove_vf,
}; };
module_pci_driver(cavium_rng_vf_driver); module_pci_driver(cavium_rng_vf_driver);

3
drivers/char/hw_random/exynos-trng.c
View File

@ -153,7 +153,7 @@ static int exynos_trng_probe(struct platform_device *pdev)
goto err_clock; goto err_clock;
} }
ret = hwrng_register(&trng->rng); ret = devm_hwrng_register(&pdev->dev, &trng->rng);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Could not register hwrng device.\n"); dev_err(&pdev->dev, "Could not register hwrng device.\n");
goto err_register; goto err_register;
@ -179,7 +179,6 @@ static int exynos_trng_remove(struct platform_device *pdev)
{ {
struct exynos_trng_dev *trng = platform_get_drvdata(pdev); struct exynos_trng_dev *trng = platform_get_drvdata(pdev);
hwrng_unregister(&trng->rng);
clk_disable_unprepare(trng->clk); clk_disable_unprepare(trng->clk);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);

4
drivers/char/hw_random/n2-drv.c
View File

@ -768,7 +768,7 @@ static int n2rng_probe(struct platform_device *op)
np->hwrng.data_read = n2rng_data_read; np->hwrng.data_read = n2rng_data_read;
np->hwrng.priv = (unsigned long) np; np->hwrng.priv = (unsigned long) np;
err = hwrng_register(&np->hwrng); err = devm_hwrng_register(&pdev->dev, &np->hwrng);
if (err) if (err)
goto out_hvapi_unregister; goto out_hvapi_unregister;
@ -793,8 +793,6 @@ static int n2rng_remove(struct platform_device *op)
cancel_delayed_work_sync(&np->work); cancel_delayed_work_sync(&np->work);
hwrng_unregister(&np->hwrng);
sun4v_hvapi_unregister(HV_GRP_RNG); sun4v_hvapi_unregister(HV_GRP_RNG);
return 0; return 0;

3
drivers/char/hw_random/nomadik-rng.c
View File

@ -57,7 +57,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
if (!base) if (!base)
goto out_release; goto out_release;
nmk_rng.priv = (unsigned long)base; nmk_rng.priv = (unsigned long)base;
ret = hwrng_register(&nmk_rng); ret = devm_hwrng_register(&dev->dev, &nmk_rng);
if (ret) if (ret)
goto out_release; goto out_release;
return 0; return 0;
@ -71,7 +71,6 @@ out_clk:
static int nmk_rng_remove(struct amba_device *dev) static int nmk_rng_remove(struct amba_device *dev)
{ {
hwrng_unregister(&nmk_rng);
amba_release_regions(dev); amba_release_regions(dev);
clk_disable(rng_clk); clk_disable(rng_clk);
return 0; return 0;

3
drivers/char/hw_random/omap-rng.c
View File

@ -500,7 +500,7 @@ static int omap_rng_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_register; goto err_register;
ret = hwrng_register(&priv->rng); ret = devm_hwrng_register(&pdev->dev, &priv->rng);
if (ret) if (ret)
goto err_register; goto err_register;
@ -525,7 +525,6 @@ static int omap_rng_remove(struct platform_device *pdev)
{ {
struct omap_rng_dev *priv = platform_get_drvdata(pdev); struct omap_rng_dev *priv = platform_get_drvdata(pdev);
hwrng_unregister(&priv->rng);
priv->pdata->cleanup(priv); priv->pdata->cleanup(priv);

10
drivers/char/hw_random/powernv-rng.c
View File

@ -33,18 +33,11 @@ static struct hwrng powernv_hwrng = {
.read = powernv_rng_read, .read = powernv_rng_read,
}; };
static int powernv_rng_remove(struct platform_device *pdev)
{
hwrng_unregister(&powernv_hwrng);
return 0;
}
static int powernv_rng_probe(struct platform_device *pdev) static int powernv_rng_probe(struct platform_device *pdev)
{ {
int rc; int rc;
rc = hwrng_register(&powernv_hwrng); rc = devm_hwrng_register(&pdev->dev, &powernv_hwrng);
if (rc) { if (rc) {
/* We only register one device, ignore any others */ /* We only register one device, ignore any others */
if (rc == -EEXIST) if (rc == -EEXIST)
@ -70,7 +63,6 @@ static struct platform_driver powernv_rng_driver = {
.of_match_table = powernv_rng_match, .of_match_table = powernv_rng_match,
}, },
.probe = powernv_rng_probe, .probe = powernv_rng_probe,
.remove = powernv_rng_remove,
}; };
module_platform_driver(powernv_rng_driver); module_platform_driver(powernv_rng_driver);

4
drivers/char/hw_random/st-rng.c
View File

@ -102,7 +102,7 @@ static int st_rng_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, ddata); dev_set_drvdata(&pdev->dev, ddata);
ret = hwrng_register(&ddata->ops); ret = devm_hwrng_register(&pdev->dev, &ddata->ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to register HW RNG\n"); dev_err(&pdev->dev, "Failed to register HW RNG\n");
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
@ -118,8 +118,6 @@ static int st_rng_remove(struct platform_device *pdev)
{ {
struct st_rng_data *ddata = dev_get_drvdata(&pdev->dev); struct st_rng_data *ddata = dev_get_drvdata(&pdev->dev);
hwrng_unregister(&ddata->ops);
clk_disable_unprepare(ddata->clk); clk_disable_unprepare(ddata->clk);
return 0; return 0;

4
drivers/char/hw_random/xgene-rng.c
View File

@ -361,7 +361,7 @@ static int xgene_rng_probe(struct platform_device *pdev)
xgene_rng_func.priv = (unsigned long) ctx; xgene_rng_func.priv = (unsigned long) ctx;
rc = hwrng_register(&xgene_rng_func); rc = devm_hwrng_register(&pdev->dev, &xgene_rng_func);
if (rc) { if (rc) {
dev_err(&pdev->dev, "RNG registering failed error %d\n", rc); dev_err(&pdev->dev, "RNG registering failed error %d\n", rc);
if (!IS_ERR(ctx->clk)) if (!IS_ERR(ctx->clk))
@ -375,7 +375,6 @@ static int xgene_rng_probe(struct platform_device *pdev)
rc); rc);
if (!IS_ERR(ctx->clk)) if (!IS_ERR(ctx->clk))
clk_disable_unprepare(ctx->clk); clk_disable_unprepare(ctx->clk);
hwrng_unregister(&xgene_rng_func);
return rc; return rc;
} }
@ -392,7 +391,6 @@ static int xgene_rng_remove(struct platform_device *pdev)
dev_err(&pdev->dev, "RNG init wakeup failed error %d\n", rc); dev_err(&pdev->dev, "RNG init wakeup failed error %d\n", rc);
if (!IS_ERR(ctx->clk)) if (!IS_ERR(ctx->clk))
clk_disable_unprepare(ctx->clk); clk_disable_unprepare(ctx->clk);
hwrng_unregister(&xgene_rng_func);
return rc; return rc;
} }