When converting this driver to devm_ioremap_resource, the removal of this now
unneeded function has been forgotten.
Signed-off-by: Wolfram Sang <w...@the-dreams.de>
---
drivers/char/hw_random/omap-rng.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/char/hw_random/omap-rng.c
b/drivers/char/hw_random/omap-rng.c
index d2903e7..7af2b24 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -52,7 +52,6 @@
*/
struct omap_rng_private_data {
void __iomem *base;
- struct resource *mem_res;
};
static inline u32 omap_rng_read_reg(struct omap_rng_private_data *priv, int
reg)
@@ -107,6 +106,7 @@ static struct hwrng omap_rng_ops = {
static int omap_rng_probe(struct platform_device *pdev)
{
struct omap_rng_private_data *priv;
+ struct resource *mem_res;
int ret;
priv = kzalloc(sizeof(struct omap_rng_private_data), GFP_KERNEL);
@@ -118,8 +118,8 @@ static int omap_rng_probe(struct platform_device *pdev)
omap_rng_ops.priv = (unsigned long)priv;
dev_set_drvdata(&pdev->dev, priv);
- priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
+ mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ priv->base = devm_ioremap_resource(&pdev->dev, mem_res);
if (IS_ERR(priv->base)) {
ret = PTR_ERR(priv->base);
goto err_ioremap;
@@ -160,8 +160,6 @@ static int __exit omap_rng_remove(struct platform_device
*pdev)
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
- release_mem_region(priv->mem_res->start, resource_size(priv->mem_res));
-
kfree(priv);
return 0;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
