Skip to contentSkip to conversation

PCI: xgene: Fix the map_bus callback prototype

PATCH In review Phong Tran 3 participants 4 messages Feb 23, 2015 – Feb 26, 2015 PCI

lore
Share & tools
lore

Phong Tran

author
#0 lore raw

PATCH 1/1 PCI: xgene: Fix the map_bus callback prototype

The return value should be void __iomem *.
Tested by compile only.

---
 drivers/pci/host/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-xgene.c +1 -1
index aab5547..9c3bfd8 100644
@@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)
 	return false;
 }
 
-static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
+static void __iomem *xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 			      int offset)
 {
 	struct xgene_pcie_port *port = bus->sysdata;
Signature · 1 line
2.1.0
maintainer
#2 lore raw
In reply to Phong Tran

[+cc Fabio]

Quoted 4 lines · Phong Tran

The return value should be void __iomem *.
Tested by compile only.

I've already applied an identical patch from Fabio Estevam. I added Arnd's ack to it and also mentioned you in the credits, Phong.

Quoted 20 lines
---
 drivers/pci/host/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-xgene.c +1 -1
index aab5547..9c3bfd8 100644
@@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)
 	return false;
 }
 
-static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
+static void __iomem *xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 			      int offset)
 {
 	struct xgene_pcie_port *port = bus->sysdata;
Signature · 1 line
2.1.0
maintainer
#3 lore raw
Quoted 10 lines · Bjorn Helgaas

[+cc Fabio]

Quoted 4 lines · Phong Tran

The return value should be void __iomem *.
Tested by compile only.

I've already applied an identical patch from Fabio Estevam. I added Arnd's ack to it and also mentioned you in the credits, Phong.

Dropped in favor of a more complete fix:
https://patchwork.ozlabs.org/patch/440759/

Quoted 20 lines
Quoted 20 lines
---
 drivers/pci/host/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-xgene.c +1 -1
index aab5547..9c3bfd8 100644
@@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)
 	return false;
 }
 
-static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
+static void __iomem *xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 			      int offset)
 {
 	struct xgene_pcie_port *port = bus->sysdata;
Signature · 1 line
2.1.0