Skip to content

Commit

Permalink
hwrng: use platform_{get,set}_drvdata()
Browse files Browse the repository at this point in the history
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 <jg1.han@samsung.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Jingoo Han authored and Herbert Xu committed Jun 5, 2013
1 parent a3485e6 commit 1f539bc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
6 changes: 2 additions & 4 deletions drivers/char/hw_random/n2-drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -721,7 +721,7 @@ static int n2rng_probe(struct platform_device *op)

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;

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

kfree(np);

dev_set_drvdata(&op->dev, NULL);

return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/char/hw_random/octeon-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions drivers/char/hw_random/omap-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
if (!priv->mem_res) {
Expand All @@ -129,7 +129,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);
Expand All @@ -156,7 +156,7 @@ static int omap_rng_probe(struct platform_device *pdev)

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

Expand Down

0 comments on commit 1f539bc

Please sign in to comment.