Commit 56c4a022 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Nishanth Menon

drivers: bus: omap_l3: Convert to use devm_ioremap_resource()

We can then remove the iounmap() calls from probe and remove.
Since the driver requests the resources via index we can do the mem resource
request within a for loop.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Tested-by: default avatarSekhar Nori <nsekhar@ti.com>
parent bae74510
...@@ -131,52 +131,24 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) ...@@ -131,52 +131,24 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
static int omap4_l3_probe(struct platform_device *pdev) static int omap4_l3_probe(struct platform_device *pdev)
{ {
static struct omap4_l3 *l3; static struct omap4_l3 *l3;
struct resource *res; int ret, i;
int ret;
l3 = devm_kzalloc(&pdev->dev, sizeof(*l3), GFP_KERNEL); l3 = devm_kzalloc(&pdev->dev, sizeof(*l3), GFP_KERNEL);
if (!l3) if (!l3)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, l3); platform_set_drvdata(pdev, l3);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "couldn't find resource 0\n");
return -ENODEV;
}
l3->l3_base[0] = ioremap(res->start, resource_size(res));
if (!l3->l3_base[0]) {
dev_err(&pdev->dev, "ioremap failed\n");
return -ENOMEM;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res) {
dev_err(&pdev->dev, "couldn't find resource 1\n");
ret = -ENODEV;
goto err1;
}
l3->l3_base[1] = ioremap(res->start, resource_size(res)); /* Get mem resources */
if (!l3->l3_base[1]) { for (i = 0; i < L3_MODULES; i++) {
dev_err(&pdev->dev, "ioremap failed\n"); struct resource *res = platform_get_resource(pdev,
ret = -ENOMEM; IORESOURCE_MEM, i);
goto err1;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
if (!res) {
dev_err(&pdev->dev, "couldn't find resource 2\n");
ret = -ENODEV;
goto err2;
}
l3->l3_base[2] = ioremap(res->start, resource_size(res)); l3->l3_base[i] = devm_ioremap_resource(&pdev->dev, res);
if (!l3->l3_base[2]) { if (IS_ERR(l3->l3_base[i])) {
dev_err(&pdev->dev, "ioremap failed\n"); dev_err(&pdev->dev, "ioremap %d failed\n", i);
ret = -ENOMEM; return PTR_ERR(l3->l3_base[i]);
goto err2; }
} }
/* /*
...@@ -189,7 +161,7 @@ static int omap4_l3_probe(struct platform_device *pdev) ...@@ -189,7 +161,7 @@ static int omap4_l3_probe(struct platform_device *pdev)
if (ret) { if (ret) {
pr_crit("L3: request_irq failed to register for 0x%x\n", pr_crit("L3: request_irq failed to register for 0x%x\n",
l3->debug_irq); l3->debug_irq);
goto err3; return ret;
} }
l3->app_irq = platform_get_irq(pdev, 1); l3->app_irq = platform_get_irq(pdev, 1);
...@@ -206,12 +178,6 @@ static int omap4_l3_probe(struct platform_device *pdev) ...@@ -206,12 +178,6 @@ static int omap4_l3_probe(struct platform_device *pdev)
err4: err4:
free_irq(l3->debug_irq, l3); free_irq(l3->debug_irq, l3);
err3:
iounmap(l3->l3_base[2]);
err2:
iounmap(l3->l3_base[1]);
err1:
iounmap(l3->l3_base[0]);
return ret; return ret;
} }
...@@ -221,9 +187,6 @@ static int omap4_l3_remove(struct platform_device *pdev) ...@@ -221,9 +187,6 @@ static int omap4_l3_remove(struct platform_device *pdev)
free_irq(l3->app_irq, l3); free_irq(l3->app_irq, l3);
free_irq(l3->debug_irq, l3); free_irq(l3->debug_irq, l3);
iounmap(l3->l3_base[0]);
iounmap(l3->l3_base[1]);
iounmap(l3->l3_base[2]);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment