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: 2697151 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D4D6CDF264 for ; Mon, 10 Jun 2013 11:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753721Ab3FJLvh (ORCPT ); Mon, 10 Jun 2013 07:51:37 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=zrsWGST9nbmrKD+rGAjCNWiWD1bW5Eh+scu2IFKSFws=; b=CA6sKEIiGB8xvlkNkzNWU6+Tr7jEJMTA69CZOhxoVfpvBN0WIfFCxSCCnnG2hU71N2 ibo/vJWh2gKe66A1/0ZZhsaTwubCTPTfoNQXm/rK2DLgdmMHDpu7YCOGg+fRPR5LmJLL Z0i4+IRRImKPr2w8Pk9hawkSt78i+ml/pmGK7RGFyCwfes9JEMl3RTlg3uVw7/QjRoKE HXvDAe0ZOJgAEyyw1mAWydBxVrMRIjHaaxN79da72HxtAdJabHZPvV8gcaT4wgVBz+jt 2uqAueT9KUve1nwHcwyRba1lhlu21G/bze6C97J/6bx3Zw9LGqbWgeLqAOxAWsHZbiHh XT5w== 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: ALoCoQk+t/hnukwAodtE0zPc7swuN/acUCepeuHDiGe4+Eg/kcKMJnPuJC+YW1wr9txTiQw9MSIW Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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; }