Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / char / hw_random / octeon-rng.c

diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index 6234a4a19b5690235b7b12cd916a88006ae888a0..8c78aa0904925728404b49aedda73a212330cb3a 100644 (file)
--- 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;
 
        platform_set_drvdata(pdev, &rng->ops);
-       ret = hwrng_register(&rng->ops);
+       ret = devm_hwrng_register(&pdev->dev, &rng->ops);
        if (ret)
                return -ENOENT;
 
@@ -105,21 +105,11 @@ static int octeon_rng_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int octeon_rng_remove(struct platform_device *pdev)
-{
-       struct hwrng *rng = platform_get_drvdata(pdev);
-
-       hwrng_unregister(rng);
-
-       return 0;
-}
-
 static struct platform_driver octeon_rng_driver = {
        .driver = {
                .name           = "octeon_rng",
        },
        .probe          = octeon_rng_probe,
-       .remove         = octeon_rng_remove,
 };
 
 module_platform_driver(octeon_rng_driver);