2013-05-23 10:27:29

by Jingoo Han

Subject: [PATCH] hwrng: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: Jingoo Han <[email protected]>
---
drivers/char/hw_random/n2-drv.c | 6 ++----
drivers/char/hw_random/octeon-rng.c | 4 ++--
drivers/char/hw_random/omap-rng.c | 6 +++---
3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 20b962e..f9beed5 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -700,7 +700,7 @@ static int n2rng_probe(struct platform_device *op)
if (err)
goto out_free_units;

- dev_set_drvdata(&op->dev, np);
+ platform_set_drvdata(op, np);

schedule_delayed_work(&np->work, 0);

@@ -721,7 +721,7 @@ out:

static int n2rng_remove(struct platform_device *op)
{
- struct n2rng *np = dev_get_drvdata(&op->dev);
+ struct n2rng *np = platform_get_drvdata(op);

np->flags |= N2RNG_FLAG_SHUTDOWN;

@@ -736,8 +736,6 @@ static int n2rng_remove(struct platform_device *op)

kfree(np);

- dev_set_drvdata(&op->dev, NULL);
-
return 0;
}

diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index 1eada56..f2885db 100644
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
@@ -96,7 +96,7 @@ static int octeon_rng_probe(struct platform_device *pdev)

rng->ops = ops;

- dev_set_drvdata(&pdev->dev, &rng->ops);
+ platform_set_drvdata(pdev, &rng->ops);
ret = hwrng_register(&rng->ops);
if (ret)
return -ENOENT;
@@ -108,7 +108,7 @@ static int octeon_rng_probe(struct platform_device *pdev)

static int __exit octeon_rng_remove(struct platform_device *pdev)
{
- struct hwrng *rng = dev_get_drvdata(&pdev->dev);
+ struct hwrng *rng = platform_get_drvdata(pdev);

hwrng_unregister(rng);

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index d2903e7..6843ec8 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -116,7 +116,7 @@ static int omap_rng_probe(struct platform_device *pdev)
};

omap_rng_ops.priv = (unsigned long)priv;
- dev_set_drvdata(&pdev->dev, priv);
+ platform_set_drvdata(pdev, priv);

priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
@@ -124,7 +124,7 @@ static int omap_rng_probe(struct platform_device *pdev)
ret = PTR_ERR(priv->base);
goto err_ioremap;
}
- dev_set_drvdata(&pdev->dev, priv);
+ platform_set_drvdata(pdev, priv);

pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);
@@ -151,7 +151,7 @@ err_ioremap:

static int __exit omap_rng_remove(struct platform_device *pdev)
{
- struct omap_rng_private_data *priv = dev_get_drvdata(&pdev->dev);
+ struct omap_rng_private_data *priv = platform_get_drvdata(pdev);

hwrng_unregister(&omap_rng_ops);

--
1.7.10.4

2013-05-28 09:16:21

by Herbert Xu

Subject: Re: [PATCH] hwrng: use platform_{get,set}_drvdata()

On Thu, May 23, 2013 at 07:27:26PM +0900, Jingoo Han wrote:
> Use the wrapper functions for getting and setting the driver data using
> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
> so we can directly pass a struct platform_device.
>
> Also, unnecessary dev_set_drvdata() is removed, because the driver core
> clears the driver data to NULL after device_release or on probe failure.
>
> Signed-off-by: Jingoo Han <[email protected]>

Sorry but this patch doesn't apply against the current cryptodev
tree. If you are basing your patch on another tree, please submit
the patch there.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2013-05-28 23:54:35

by Jingoo Han

Subject: Re: [PATCH] hwrng: use platform_{get,set}_drvdata()

On Tuesday, May 28, 2013 6:16 PM, Herbert Xu wrote:
> On Thu, May 23, 2013 at 07:27:26PM +0900, Jingoo Han wrote:
> > Use the wrapper functions for getting and setting the driver data using
> > platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
> > so we can directly pass a struct platform_device.
> >
> > Also, unnecessary dev_set_drvdata() is removed, because the driver core
> > clears the driver data to NULL after device_release or on probe failure.
> >
> > Signed-off-by: Jingoo Han <[email protected]>
>
> Sorry but this patch doesn't apply against the current cryptodev
> tree. If you are basing your patch on another tree, please submit
> the patch there.

Hi Herbert Xu,

I will make the patch based on your "cryptodev" tree,
and will send it, soon. :)

Best regards,
Jingoo Han

>
> Thanks,
> --