These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / char / hw_random / octeon-rng.c

diff --git a/kernel/drivers/char/hw_random/octeon-rng.c b/kernel/drivers/char/hw_random/octeon-rng.c
index 6234a4a..8c78aa0 100644 (file)
--- a/kernel/drivers/char/hw_random/octeon-rng.c
+++ b/kernel/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);