Skip to contentSkip to conversation

PCI: dwc: Use devm_ioremap_resource instead of devm_ioremap_resource

PATCH Applied Gustavo Pimentel 2 participants 4 messages May 14, 2018 – May 15, 2018 PCI

lore
Share & tools
lore

Gustavo Pimentel

author
#0 lore raw

cover PCI: dwc: Use devm_ioremap_resource instead of devm_ioremap_resource

This fix aims to replace the use of devm_ioremap() by devm_ioremap_resource() already discussed on [1]

Gustavo Pimentel (2):
PCI: dwc: artpec6: Use devm_ioremap_resource instead of devm_ioremap
PCI: dwc: dra7xx: Use devm_ioremap_resource instead of devm_ioremap

 drivers/pci/dwc/pci-dra7xx.c   | 18 +++++++++---------
 drivers/pci/dwc/pcie-artpec6.c |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 PCI: dwc: artpec6: Use devm_ioremap_resource instead of devm_ioremap

This fix aims to replace the use of devm_ioremap() by devm_ioremap_resource() already discussed on [1].

[1] -> https://lkml.kernel.org/r/20180120001645.GA21343@lenoch

Signed-off-by Gustavo Pimentel <[email protected]>
Acked-by Jesper Nilsson <[email protected]>
---
 drivers/pci/dwc/pcie-artpec6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/dwc/pcie-artpec6.c +3 -3
index e66cede..321b56c 100644
@@ -463,9 +463,9 @@ static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie,
 	ep->ops = &pcie_ep_ops;
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");
-	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)
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/2 PCI: dwc: dra7xx: Use devm_ioremap_resource instead of devm_ioremap

In reply to Gustavo Pimentel

This fix aims to replace the use of devm_ioremap() by devm_ioremap_resource() already discussed on [1].

[1] -> https://lkml.kernel.org/r/20180120001645.GA21343@lenoch

Signed-off-by Gustavo Pimentel <[email protected]>
Acked-by Kishon Vijay Abraham I <[email protected]>
---
 drivers/pci/dwc/pci-dra7xx.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +9 -9
index ed8558d..b410bb4 100644
@@ -406,14 +406,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)

@@ -459,9 +459,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;
Signature · 1 line
2.7.4
Applied
#3 lore raw
In reply to Gustavo Pimentel
Quoted 10 lines · Gustavo Pimentel

This fix aims to replace the use of devm_ioremap() by devm_ioremap_resource() already discussed on [1]

Gustavo Pimentel (2):
PCI: dwc: artpec6: Use devm_ioremap_resource instead of devm_ioremap
PCI: dwc: dra7xx: Use devm_ioremap_resource instead of devm_ioremap

 drivers/pci/dwc/pci-dra7xx.c   | 18 +++++++++---------
 drivers/pci/dwc/pcie-artpec6.c |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

Applied to pci/dwc for v4.18 with all required log tweaks, please read Bjorn's guidelines below:

https://marc.info/?l=linux-pci&m=150905742808166&w=2

Thanks,
Lorenzo