From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com ([209.85.220.42]:56043 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753796Ab3FJLuq (ORCPT ); Mon, 10 Jun 2013 07:50:46 -0400 Received: by mail-pa0-f42.google.com with SMTP id rl6so4375404pac.1 for ; Mon, 10 Jun 2013 04:50:46 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: thierry.reding@gmail.com, patches@linaro.org, linux-pci@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 13/15] pci: mvebu: Convert to use devm_ioremap_resource Date: Mon, 10 Jun 2013 17:05:11 +0530 Message-Id: <1370864113-17895-14-git-send-email-tushar.behera@linaro.org> In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> Sender: linux-pci-owner@vger.kernel.org List-ID: Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). Signed-off-by: Tushar Behera CC: linux-pci@vger.kernel.org CC: Bjorn Helgaas --- drivers/pci/host/pci-mvebu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 13a633b..e714876 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -752,7 +752,7 @@ mvebu_pcie_map_registers(struct platform_device *pdev, if (ret) return NULL; - return devm_request_and_ioremap(&pdev->dev, ®s); + return devm_ioremap_resource(&pdev->dev, ®s); } static int __init mvebu_pcie_probe(struct platform_device *pdev) @@ -842,9 +842,10 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) continue; port->base = mvebu_pcie_map_registers(pdev, child, port); - if (!port->base) { + if (IS_ERR(port->base)) { dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n", port->port, port->lane); + port->base = NULL; continue; } -- 1.7.9.5