Skip to contentSkip to conversation

PCI: xgene: Fix xgene_pcie_map_bus() return type

PATCH Applied Fabio Estevam 3 participants 4 messages Feb 9, 2015 – Feb 26, 2015 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: xgene: Fix xgene_pcie_map_bus() return type

From: Fabio Estevam <[email protected]>

Commit 350f8be5bb402a1 ("PCI: xgene: Convert to use generic config accessors") introduced the following build warnings:

drivers/pci/host/pci-xgene.c:137:3: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:140:2: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:144:2: warning: initialization from incompatible pointer type drivers/pci/host/pci-xgene.c:144:2: warning: (near initialization for 'xgene_pcie_ops.map_bus')

The .map_bus function should return 'void __iomem *' instead of 'int'.

---
 drivers/pci/host/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-xgene.c +1 -1
index aab5547..22addb6 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
1.9.1
maintainer Applied
#1 lore raw

[+cc Tanmay]

Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 350f8be5bb402a1 ("PCI: xgene: Convert to use generic config accessors") introduced the following build warnings:

drivers/pci/host/pci-xgene.c:137:3: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:140:2: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:144:2: warning: initialization from incompatible pointer type drivers/pci/host/pci-xgene.c:144:2: warning: (near initialization for 'xgene_pcie_ops.map_bus')

Quoted 4 lines

The .map_bus function should return 'void __iomem *' instead of 'int'.

Applied to for-linus for v4.0, thanks!

Rob, Tanmay, speak up if you object.

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..22addb6 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
1.9.1
#2 lore raw
Quoted 13 lines · Bjorn Helgaas

[+cc Tanmay]

Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 350f8be5bb402a1 ("PCI: xgene: Convert to use generic config accessors") introduced the following build warnings:

drivers/pci/host/pci-xgene.c:137:3: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:140:2: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:144:2: warning: initialization from incompatible pointer type drivers/pci/host/pci-xgene.c:144:2: warning: (near initialization for 'xgene_pcie_ops.map_bus')

Quoted 8 lines
Quoted 4 lines

The .map_bus function should return 'void __iomem *' instead of 'int'.

Applied to for-linus for v4.0, thanks!

Rob, Tanmay, speak up if you object.

While this fixes the warning, it doesn't fix the real problem. You should apply this instead:

https://patchwork.ozlabs.org/patch/440759/

Rob

Quoted 21 lines
Quoted 21 lines
---
 drivers/pci/host/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-xgene.c +1 -2
index aab5547..22addb6 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;
--

1.9.1

maintainer
#3 lore raw
Quoted 19 lines · Rob Herring
Quoted 18 lines · Bjorn Helgaas

[+cc Tanmay]

Quoted 14 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 350f8be5bb402a1 ("PCI: xgene: Convert to use generic config accessors") introduced the following build warnings:

drivers/pci/host/pci-xgene.c:137:3: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:140:2: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:144:2: warning: initialization from incompatible pointer type drivers/pci/host/pci-xgene.c:144:2: warning: (near initialization for 'xgene_pcie_ops.map_bus')

The .map_bus function should return 'void __iomem *' instead of 'int'.

Quoted 8 lines
Quoted 3 lines

Applied to for-linus for v4.0, thanks!

Rob, Tanmay, speak up if you object.

While this fixes the warning, it doesn't fix the real problem. You should apply this instead:

https://patchwork.ozlabs.org/patch/440759/

OK, will do, thanks! I hadn't worked my way down to that one yet.

Quoted 20 lines
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 -2
index aab5547..22addb6 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;
--

1.9.1