From patchwork Mon Jun 10 11:35:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 17730 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f198.google.com (mail-gg0-f198.google.com [209.85.161.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C68125DF9 for ; Mon, 10 Jun 2013 11:50:48 +0000 (UTC) Received: by mail-gg0-f198.google.com with SMTP id p4sf3781557ggn.1 for ; Mon, 10 Jun 2013 04:50:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=zrsWGST9nbmrKD+rGAjCNWiWD1bW5Eh+scu2IFKSFws=; b=CGRPEpouw0ngPICSN8BgRuRpor3AZUmryHDfW06TQOVGHix/iRf948axlyrNEUCo5Q aYkSevca6/fxqwv49dpMilClLLMC4Xnh4lvbMUgBpKCu8p7Os29Z1sa44jcfC5dhF9L2 hwR/dl8U5v6STcfXFShDGPibnEAE44KM8PAt6vlxOK0HVngnmRdhrSdl/Gs8ti3KznOz tYnK0VfMIlpoIEKyZ1dN4L0tyorjegH8kpTRrqFUnpPgeqJD99IErFXnxOl7d2CtDIUy YKY36/TZr9fLMZp4J+1xyI5SPpZuwtSIWWErvVqBumYEKbluLixAwGXRpfWMqeGP0fqS ccFg== X-Received: by 10.224.174.145 with SMTP id t17mr8261761qaz.4.1370865047878; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.88.99 with SMTP id bf3ls2670704qeb.78.gmail; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) X-Received: by 10.52.117.134 with SMTP id ke6mr4511359vdb.66.1370865047682; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id ra6si4702181vec.17.2013.06.10.04.50.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id gf12so4310076vcb.41 for ; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) X-Received: by 10.220.170.72 with SMTP id c8mr5380144vcz.14.1370865047567; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp64989vcb; Mon, 10 Jun 2013 04:50:47 -0700 (PDT) X-Received: by 10.68.52.10 with SMTP id p10mr9688436pbo.92.1370865046760; Mon, 10 Jun 2013 04:50:46 -0700 (PDT) Received: from mail-pb0-x235.google.com (mail-pb0-x235.google.com [2607:f8b0:400e:c01::235]) by mx.google.com with ESMTPS id tw9si6818430pac.129.2013.06.10.04.50.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:46 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c01::235 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=2607:f8b0:400e:c01::235; Received: by mail-pb0-f53.google.com with SMTP id xb12so7133588pbc.12 for ; Mon, 10 Jun 2013 04:50:46 -0700 (PDT) X-Received: by 10.68.197.66 with SMTP id is2mr9519395pbc.175.1370865046257; Mon, 10 Jun 2013 04:50:46 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id rn7sm10242037pbc.12.2013.06.10.04.50.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:45 -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> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQlQjbEE2bIpeWSGmzKXpYFE8q8G4jFoHVcMchmbimoJrZOkYtIzdL4swsRiQl1IaG8MKBqb X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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; }