]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
PCI: dwc: dra7xx: Use devm_ioremap_resource() instead of devm_ioremap()
authorGustavo Pimentel <gustavo.pimentel@synopsys.com>
Mon, 14 May 2018 17:32:35 +0000 (18:32 +0100)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 15 May 2018 15:41:49 +0000 (16:41 +0100)
Replace the use of devm_ioremap() with devm_ioremap_resource() as
reported and discussed in the mailing list thread provided.

Link: https://lkml.kernel.org/r/20180120001645.GA21343@lenoch
Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
[lorenzo.pieralisi@arm.com: updated commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/pci/dwc/pci-dra7xx.c

index 620709d38a6467ec61a03696b57705ff0889b847..f688204e50c5f5e7862e75b9e264a650856eb483 100644 (file)
@@ -407,14 +407,14 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,
        ep->ops = &pcie_ep_ops;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics");
-       pci->dbi_base = devm_ioremap(dev, res->start, resource_size(res));
-       if (!pci->dbi_base)
-               return -ENOMEM;
+       pci->dbi_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(pci->dbi_base))
+               return PTR_ERR(pci->dbi_base);
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics2");
-       pci->dbi_base2 = devm_ioremap(dev, res->start, resource_size(res));
-       if (!pci->dbi_base2)
-               return -ENOMEM;
+       pci->dbi_base2 = devm_ioremap_resource(dev, res);
+       if (IS_ERR(pci->dbi_base2))
+               return PTR_ERR(pci->dbi_base2);
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
        if (!res)
@@ -460,9 +460,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
                return ret;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");
-       pci->dbi_base = devm_ioremap(dev, res->start, resource_size(res));
-       if (!pci->dbi_base)
-               return -ENOMEM;
+       pci->dbi_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(pci->dbi_base))
+               return PTR_ERR(pci->dbi_base);
 
        pp->ops = &dra7xx_pcie_host_ops;