OSDN Git Service

hwrng: bcm2835 - Use device managed helpers
authorFlorian Fainelli <f.fainelli@gmail.com>
Wed, 8 Nov 2017 00:44:42 +0000 (16:44 -0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 29 Nov 2017 05:43:44 +0000 (16:43 +1100)
Now that we have moved the RNG disabling into a hwrng::cleanup callback,
we can use the device managed registration operation and remove our
remove callback since it won't do anything necessary.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/char/hw_random/bcm2835-rng.c

index 4d03561..67b9bd3 100644 (file)
@@ -138,7 +138,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev)
                rng_setup(priv->base);
 
        /* register driver */
-       err = hwrng_register(&priv->rng);
+       err = devm_hwrng_register(dev, &priv->rng);
        if (err)
                dev_err(dev, "hwrng registration failed\n");
        else
@@ -147,16 +147,6 @@ static int bcm2835_rng_probe(struct platform_device *pdev)
        return err;
 }
 
-static int bcm2835_rng_remove(struct platform_device *pdev)
-{
-       struct bcm2835_rng_priv *priv = platform_get_drvdata(pdev);
-
-       /* unregister driver */
-       hwrng_unregister(&priv->rng);
-
-       return 0;
-}
-
 MODULE_DEVICE_TABLE(of, bcm2835_rng_of_match);
 
 static struct platform_driver bcm2835_rng_driver = {
@@ -165,7 +155,6 @@ static struct platform_driver bcm2835_rng_driver = {
                .of_match_table = bcm2835_rng_of_match,
        },
        .probe          = bcm2835_rng_probe,
-       .remove         = bcm2835_rng_remove,
 };
 module_platform_driver(bcm2835_rng_driver);