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

Commit f440c4ee authored by Álvaro Fernández Rojas's avatar Álvaro Fernández Rojas Committed by Herbert Xu
Browse files

hwrng: bcm63xx - Fix driver compilation 



- s/clk_didsable_unprepare/clk_disable_unprepare
- s/prov/priv
- s/error/ret (bcm63xx_rng_probe)

Fixes: 6229c160 ("hwrng: bcm63xx - make use of devm_hwrng_register")
Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7829fb09

drivers/char/hw_random/bcm63xx-rng.c

+9 −9
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void bcm63xx_rng_cleanup(struct hwrng *rng) 
	val &= ~RNG_EN;

	__raw_writel(val, priv->regs + RNG_CTRL);



	clk_didsable_unprepare(prov->clk);

	clk_disable_unprepare(priv->clk);

}



static int bcm63xx_rng_data_present(struct hwrng *rng, int wait)
@@ -97,14 +97,14 @@ static int bcm63xx_rng_probe(struct platform_device *pdev) 
	priv->rng.name = pdev->name;

	priv->rng.init = bcm63xx_rng_init;

	priv->rng.cleanup = bcm63xx_rng_cleanup;

	prov->rng.data_present = bcm63xx_rng_data_present;

	priv->rng.data_present = bcm63xx_rng_data_present;

	priv->rng.data_read = bcm63xx_rng_data_read;



	priv->clk = devm_clk_get(&pdev->dev, "ipsec");

	if (IS_ERR(priv->clk)) {

		error = PTR_ERR(priv->clk);

		dev_err(&pdev->dev, "no clock for device: %d\n", error);

		return error;

		ret = PTR_ERR(priv->clk);

		dev_err(&pdev->dev, "no clock for device: %d\n", ret);

		return ret;

	}



	if (!devm_request_mem_region(&pdev->dev, r->start,
@@ -120,11 +120,11 @@ static int bcm63xx_rng_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



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

	if (error) {

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

	if (ret) {

		dev_err(&pdev->dev, "failed to register rng device: %d\n",

			error);

		return error;

			ret);

		return ret;

	}



	dev_info(&pdev->dev, "registered RNG driver\n");