From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f47.google.com ([209.85.220.47]:59566 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751787Ab3FKEwD (ORCPT ); Tue, 11 Jun 2013 00:52:03 -0400 Received: by mail-pa0-f47.google.com with SMTP id kl14so1784127pab.6 for ; Mon, 10 Jun 2013 21:52:03 -0700 (PDT) Message-ID: <51B6ACEA.2040408@linaro.org> Date: Tue, 11 Jun 2013 10:21:54 +0530 From: Tushar Behera MIME-Version: 1.0 To: Sachin Kamat CC: linux-kernel@vger.kernel.org, thierry.reding@gmail.com, patches@linaro.org, linux-pci@vger.kernel.org, Bjorn Helgaas Subject: Re: [PATCH 13/15] pci: mvebu: Convert to use devm_ioremap_resource References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> <1370864113-17895-14-git-send-email-tushar.behera@linaro.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-pci-owner@vger.kernel.org List-ID: On 06/10/2013 07:59 PM, Sachin Kamat wrote: > On 10 June 2013 17:05, Tushar Behera wrote: >> 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); > > This error message is redundant. > It provides a little more information regarding the port and lane number which might be useful in debugging. >> + port->base = NULL; > Probably this is also not needed. > I was not sure about the default error value for port->base, hence I replicated the old behaviour. Thanks. -- Tushar Behera