Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a4c04b authored by Florian Fainelli's avatar Florian Fainelli Committed by Herbert Xu
Browse files

hwrng: bcm2835 - Use device managed helpers 



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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ec94bca7

drivers/char/hw_random/bcm2835-rng.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev) 
		rng_setup(priv->base);

		rng_setup(priv->base);





	/* register driver */

	/* register driver */

	err = hwrng_register(&priv->rng);

	err = devm_hwrng_register(dev, &priv->rng);

	if (err)

	if (err)

		dev_err(dev, "hwrng registration failed\n");

		dev_err(dev, "hwrng registration failed\n");

	else

	else
@@ -147,16 +147,6 @@ static int bcm2835_rng_probe(struct platform_device *pdev) 
	return err;

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

MODULE_DEVICE_TABLE(of, bcm2835_rng_of_match);





static struct platform_driver bcm2835_rng_driver = {

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,

		.of_match_table = bcm2835_rng_of_match,

	},

	},

	.probe		= bcm2835_rng_probe,

	.probe		= bcm2835_rng_probe,

	.remove		= bcm2835_rng_remove,

};

};

module_platform_driver(bcm2835_rng_driver);

module_platform_driver(bcm2835_rng_driver);