mailbox-omap1 : Use devm_ functions

PATCH Superseded Himangi Saraogi 1 participant 1 message Jul 1, 2014 Mailbox API

Share & tools

Himangi Saraogi

author

2014-07-01 18:45 UTC #0 lore raw

PATCH 1/1 mailbox-omap1 : Use devm_ functions

This patch intoduces the use of devm_ioremap, does away with the ret variable. The calls to iounmap in the probe and remove functions and no longer needed and hence removed.

Signed-off-by Himangi Saraogi <[email protected]>

Acked-by Julia Lawall <[email protected]>

---
 drivers/mailbox/mailbox-omap1.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

drivers/mailbox/mailbox-omap1.c +2 ~~-10~~

index 9001b76..508024f 100644
@@ -146,7 +146,6 @@ static struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info, NULL };
 static int omap1_mbox_probe(struct platform_device *pdev)
 {
 	struct resource *mem;
-	int ret;
 	struct omap_mbox **list;
 
 	list = omap1_mboxes;

@@ -156,23 +155,16 @@ static int omap1_mbox_probe(struct platform_device *pdev)
 	if (!mem)
 		return -ENOENT;
 
-	mbox_base = ioremap(mem->start, resource_size(mem));
+	mbox_base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
 	if (!mbox_base)
 		return -ENOMEM;
 
-	ret = omap_mbox_register(&pdev->dev, list);
-	if (ret) {
-		iounmap(mbox_base);
-		return ret;
-	}
-
-	return 0;
+	return omap_mbox_register(&pdev->dev, list);
 }
 
 static int omap1_mbox_remove(struct platform_device *pdev)
 {
 	omap_mbox_unregister();
-	iounmap(mbox_base);
 	return 0;
 }

Signature · 1 line

1.9.1