Commit e06da499 authored by Tian Tao's avatar Tian Tao Committed by Herbert Xu
Browse files

hwrng: bcm2835 - remove redundant null check 



clk_prepare_enable() and clk_disable_unprepare() will check
NULL clock parameter, so It is not necessary to add additional checks.

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f17a25cb

drivers/char/hw_random/bcm2835-rng.c

+7 −10
Original line number Diff line number Diff line
@@ -88,11 +88,9 @@ static int bcm2835_rng_init(struct hwrng *rng) 
	int ret = 0;

	u32 val;



	if (!IS_ERR(priv->clk)) {

	ret = clk_prepare_enable(priv->clk);

	if (ret)

		return ret;

	}



	if (priv->mask_interrupts) {

		/* mask the interrupt */
@@ -115,7 +113,6 @@ static void bcm2835_rng_cleanup(struct hwrng *rng) 
	/* disable rng hardware */

	rng_writel(priv, 0, RNG_CTRL);



	if (!IS_ERR(priv->clk))

	clk_disable_unprepare(priv->clk);

}
@@ -155,9 +152,9 @@ static int bcm2835_rng_probe(struct platform_device *pdev) 
		return PTR_ERR(priv->base);



	/* Clock is optional on most platforms */

	priv->clk = devm_clk_get(dev, NULL);

	if (PTR_ERR(priv->clk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	priv->clk = devm_clk_get_optional(dev, NULL);

	if (IS_ERR(priv->clk))

		return PTR_ERR(priv->clk);



	priv->rng.name = pdev->name;

	priv->rng.init = bcm2835_rng_init;