From patchwork Mon Jan 21 10:08:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 214062 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1EAF72C0084 for ; Mon, 21 Jan 2013 21:09:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752898Ab3AUKJg (ORCPT ); Mon, 21 Jan 2013 05:09:36 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:57273 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752654Ab3AUKJg (ORCPT ); Mon, 21 Jan 2013 05:09:36 -0500 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lx3gz-1SqzPb1TMv-016GNE; Mon, 21 Jan 2013 11:09:34 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 597472A2815F; Mon, 21 Jan 2013 11:09:32 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dDggF5Kpw+8A; Mon, 21 Jan 2013 11:09:31 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id D83892A28166; Mon, 21 Jan 2013 11:09:26 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id 3467D100825; Mon, 21 Jan 2013 11:09:23 +0100 (CET) From: Thierry Reding To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Dmitry Torokhov , Arnd Bergmann , Wolfram Sang , Jeff Garzik , linux-ide@vger.kernel.org Subject: [PATCH 05/33] ata: Convert to devm_ioremap_resource() Date: Mon, 21 Jan 2013 11:08:58 +0100 Message-Id: <1358762966-20791-6-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1358762966-20791-1-git-send-email-thierry.reding@avionic-design.de> References: <1358762966-20791-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:C0SUq/V5UrMXXRB+LgY/xh5jRQvhkxQFMy87hOT40CW Wdjg03xLRDfXyMEis3bn/35U1LmgJ4NHDd5vo3x6uODYMu3/Rg 1EPh2W3ajJwLg/HK3LeguRaovbh4kwU1tm6BRndf9RrYioE08D QfO1RsiHzfoFUrCTd8U72KfkaCj13c90x9+bSaMS+6vHdyoEqm Omj6ZgchpdnkO5v0LvSTjDhtMySgmkC5TjNekAdLzRC2jX6wnO matAnRl9R5lK6rSZ9Sds7dlFL1ExEZtnkg3TSJenYJacw6i0Xh gOYyH0ju64r87ZUNd+eiQ5cS8rVXB2p4Jy9PZ2VA9Ff43PoUZ2 iBNgOLKNmUc/Qn7IrvbgA/AK3+cx/NfE7n9AeEpEsdYcxP/j4l GbeFy3waYd8P0DUe/R1gbYNX4v+RDWXzJ2XYPIe+Bu4bVPS6uw 740+q Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. Signed-off-by: Thierry Reding Cc: Jeff Garzik Cc: linux-ide@vger.kernel.org --- drivers/ata/pata_ep93xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 556222f..c1bfaf4 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -31,6 +31,7 @@ * Copyright (C) 2006 Tower Technologies */ +#include #include #include #include @@ -937,9 +938,9 @@ static int ep93xx_pata_probe(struct platform_device *pdev) goto err_rel_gpio; } - ide_base = devm_request_and_ioremap(&pdev->dev, mem_res); - if (!ide_base) { - err = -ENXIO; + ide_base = devm_ioremap_resource(&pdev->dev, mem_res); + if (IS_ERR(ide_base)) { + err = PTR_ERR(ide_base); goto err_rel_gpio; }