Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwrng: bcm63xx - Fix driver compilation

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

Fixes: 6229c16060fe ("hwrng: bcm63xx - make use of devm_hwrng_register")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Álvaro Fernández Rojas and committed by
Herbert Xu
f440c4ee 7829fb09

+9 -9
+9 -9
drivers/char/hw_random/bcm63xx-rng.c
··· 57 57 val &= ~RNG_EN; 58 58 __raw_writel(val, priv->regs + RNG_CTRL); 59 59 60 - clk_didsable_unprepare(prov->clk); 60 + clk_disable_unprepare(priv->clk); 61 61 } 62 62 63 63 static int bcm63xx_rng_data_present(struct hwrng *rng, int wait) ··· 97 97 priv->rng.name = pdev->name; 98 98 priv->rng.init = bcm63xx_rng_init; 99 99 priv->rng.cleanup = bcm63xx_rng_cleanup; 100 - prov->rng.data_present = bcm63xx_rng_data_present; 100 + priv->rng.data_present = bcm63xx_rng_data_present; 101 101 priv->rng.data_read = bcm63xx_rng_data_read; 102 102 103 103 priv->clk = devm_clk_get(&pdev->dev, "ipsec"); 104 104 if (IS_ERR(priv->clk)) { 105 - error = PTR_ERR(priv->clk); 106 - dev_err(&pdev->dev, "no clock for device: %d\n", error); 107 - return error; 105 + ret = PTR_ERR(priv->clk); 106 + dev_err(&pdev->dev, "no clock for device: %d\n", ret); 107 + return ret; 108 108 } 109 109 110 110 if (!devm_request_mem_region(&pdev->dev, r->start, ··· 120 120 return -ENOMEM; 121 121 } 122 122 123 - error = devm_hwrng_register(&pdev->dev, &priv->rng); 124 - if (error) { 123 + ret = devm_hwrng_register(&pdev->dev, &priv->rng); 124 + if (ret) { 125 125 dev_err(&pdev->dev, "failed to register rng device: %d\n", 126 - error); 127 - return error; 126 + ret); 127 + return ret; 128 128 } 129 129 130 130 dev_info(&pdev->dev, "registered RNG driver\n");