From patchwork Thu Oct 25 15:19:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 1645251 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CC52240135 for ; Thu, 25 Oct 2012 15:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946255Ab2JYPTz (ORCPT ); Thu, 25 Oct 2012 11:19:55 -0400 Received: from filtteri2.pp.htv.fi ([213.243.153.185]:37240 "EHLO filtteri2.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946215Ab2JYPTf (ORCPT ); Thu, 25 Oct 2012 11:19:35 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri2.pp.htv.fi (Postfix) with ESMTP id 7235519B7AF; Thu, 25 Oct 2012 18:19:34 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri2.pp.htv.fi [213.243.153.185]) (amavisd-new, port 10024) with ESMTP id zhSpPMYMXyT2; Thu, 25 Oct 2012 18:19:34 +0300 (EEST) Received: from blackmetal.pp.htv.fi (cs181064211.pp.htv.fi [82.181.64.211]) by smtp4.welho.com (Postfix) with ESMTP id 2CF6C5BC018; Thu, 25 Oct 2012 18:19:34 +0300 (EEST) From: Aaro Koskinen To: wim@iguana.be, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Cc: Aaro Koskinen Subject: [RESEND PATCH v3 4/6] watchdog: omap_wdt: convert ioremap() to devm_ioremap() Date: Thu, 25 Oct 2012 18:19:10 +0300 Message-Id: <1351178352-3989-5-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi> References: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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; }