Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757266Ab2JJUXu (ORCPT ); Wed, 10 Oct 2012 16:23:50 -0400 Received: from filtteri1.pp.htv.fi ([213.243.153.184]:38955 "EHLO filtteri1.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756935Ab2JJUXp (ORCPT ); Wed, 10 Oct 2012 16:23:45 -0400 From: Aaro Koskinen To: wim@iguana.be, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aaro Koskinen Subject: [PATCH v3 4/6] watchdog: omap_wdt: convert ioremap() to devm_ioremap() Date: Wed, 10 Oct 2012 23:23:35 +0300 Message-Id: <1349900617-7035-5-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1349900617-7035-1-git-send-email-aaro.koskinen@iki.fi> References: <1349900617-7035-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1503 Lines: 54 Use devm_ioremap() to simplify the code. Signed-off-by: Aaro Koskinen --- drivers/watchdog/omap_wdt.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 45019b0..7e8d3e0 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -255,11 +255,9 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) wdev->wdt_trgr_pattern = 0x1234; mutex_init(&wdev->lock); - wdev->base = ioremap(res->start, resource_size(res)); - if (!wdev->base) { - ret = -ENOMEM; - goto err_ioremap; - } + wdev->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!wdev->base) + return -ENOMEM; platform_set_drvdata(pdev, omap_wdt); @@ -283,10 +281,6 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) err_misc: pm_runtime_disable(wdev->dev); platform_set_drvdata(pdev, NULL); - iounmap(wdev->base); - -err_ioremap: - wdev->base = NULL; return ret; } @@ -314,8 +308,6 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev) watchdog_unregister_device(wdog); platform_set_drvdata(pdev, NULL); - iounmap(wdev->base); - return 0; } -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/