| Message ID | 1423512731-9625-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
[+cc Tanmay] On Mon, Feb 09, 2015 at 06:12:11PM -0200, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > 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'. > > Reported-by: Olof's autobuilder <build@lixom.net> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Applied to for-linus for v4.0, thanks! Rob, Tanmay, speak up if you object. > --- > drivers/pci/host/pci-xgene.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c > index aab5547..22addb6 100644 > --- a/drivers/pci/host/pci-xgene.c > +++ b/drivers/pci/host/pci-xgene.c > @@ -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 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 25, 2015 at 7:04 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > [+cc Tanmay] > > On Mon, Feb 09, 2015 at 06:12:11PM -0200, Fabio Estevam wrote: >> From: Fabio Estevam <fabio.estevam@freescale.com> >> >> 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'. >> >> Reported-by: Olof's autobuilder <build@lixom.net> >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > 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 > >> --- >> drivers/pci/host/pci-xgene.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c >> index aab5547..22addb6 100644 >> --- a/drivers/pci/host/pci-xgene.c >> +++ b/drivers/pci/host/pci-xgene.c >> @@ -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 >> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 25, 2015 at 5:10 PM, Rob Herring <robh@kernel.org> wrote: > On Wed, Feb 25, 2015 at 7:04 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: >> [+cc Tanmay] >> >> On Mon, Feb 09, 2015 at 06:12:11PM -0200, Fabio Estevam wrote: >>> From: Fabio Estevam <fabio.estevam@freescale.com> >>> >>> 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'. >>> >>> Reported-by: Olof's autobuilder <build@lixom.net> >>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> >> >> 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. >>> --- >>> drivers/pci/host/pci-xgene.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c >>> index aab5547..22addb6 100644 >>> --- a/drivers/pci/host/pci-xgene.c >>> +++ b/drivers/pci/host/pci-xgene.c >>> @@ -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 >>> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index aab5547..22addb6 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -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;