2015-02-23 10:21:59

by Phong Tran

Subject: [PATCH] PCI: xgene: Fix the map_bus callback prototype

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

Signed-off-by: Phong Tran <[email protected]>
---
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..9c3bfd8 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;
--
2.1.0

2015-02-23 11:23:18

by Arnd Bergmann

Subject: Re: [PATCH] PCI: xgene: Fix the map_bus callback prototype

On Monday 23 February 2015 17:21:39 Phong Tran wrote:
> The return value should be void __iomem *.
> Tested by compile only.
>
> Signed-off-by: Phong Tran <[email protected]>
>

Acked-by: Arnd Bergmann <[email protected]>

Thanks for the fix, I had noticed this in the build bot logs
but not yet reported on the list.

Arnd

2015-02-26 01:18:30

by Bjorn Helgaas

Subject: Re: [PATCH] PCI: xgene: Fix the map_bus callback prototype

[+cc Fabio]

On Mon, Feb 23, 2015 at 05:21:39PM +0700, Phong Tran wrote:
> The return value should be void __iomem *.
> Tested by compile only.
>
> Signed-off-by: Phong Tran <[email protected]>

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.

> ---
> 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..9c3bfd8 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;
> --
> 2.1.0
>

2015-02-26 01:23:18

by Bjorn Helgaas

Subject: Re: [PATCH] PCI: xgene: Fix the map_bus callback prototype

On Wed, Feb 25, 2015 at 07:18:24PM -0600, Bjorn Helgaas wrote:
> [+cc Fabio]
>
> On Mon, Feb 23, 2015 at 05:21:39PM +0700, Phong Tran wrote:
> > The return value should be void __iomem *.
> > Tested by compile only.
> >
> > Signed-off-by: Phong Tran <[email protected]>
>
> 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/

> > ---
> > 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..9c3bfd8 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;
> > --
> > 2.1.0
> >