target/linux/mvebu/patches-3.10/0199-PCI-mvebu-Convert-to-use-devm_ioremap_resource.patch

   1 From 508e3a33ebe14ae4444a45b3f65dff5d5e6a4c73 Mon Sep 17 00:00:00 2001
   2 From: Tushar Behera <tushar.behera@linaro.org>
   3 Date: Mon, 17 Jun 2013 14:46:13 +0530
   4 Subject: [PATCH 199/203] PCI: mvebu: Convert to use devm_ioremap_resource
   5
   6 Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
   7 introduced devm_ioremap_resource() and deprecated the use of
   8 devm_request_and_ioremap().
   9
  10 While at it, modify mvebu_pcie_map_registers() to propagate error code.
  11
  12 Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
  13 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  14 Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  15 ---
  16  drivers/pci/host/pci-mvebu.c | 7 ++++---
  17  1 file changed, 4 insertions(+), 3 deletions(-)
  18
  19 --- a/drivers/pci/host/pci-mvebu.c
  20 +++ b/drivers/pci/host/pci-mvebu.c
  21 @@ -736,9 +736,9 @@ mvebu_pcie_map_registers(struct platform
  22
  23         ret = of_address_to_resource(np, 0, &regs);
  24         if (ret)
  25 -               return NULL;
  26 +               return ERR_PTR(ret);
  27
  28 -       return devm_request_and_ioremap(&pdev->dev, &regs);
  29 +       return devm_ioremap_resource(&pdev->dev, &regs);
  30  }
  31
  32  static void __init mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
  33 @@ -897,9 +897,10 @@ static int __init mvebu_pcie_probe(struc
  34                 }
  35
  36                 port->base = mvebu_pcie_map_registers(pdev, child, port);
  37 -               if (!port->base) {
  38 +               if (IS_ERR(port->base)) {
  39                         dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
  40                                 port->port, port->lane);
  41 +                       port->base = NULL;
  42                         continue;
  43                 }
  44