Patchwork powerpc: fix usage of setup_pci_atmu()

login
register
mail settings
Submitter Michael Neuling
Date April 15, 2013, 5:42 a.m.
Message ID <5881.1366004521@ale.ozlabs.ibm.com>
Download mbox | patch
Permalink /patch/236494/
State Accepted, archived
Commit d5bbe6596a318a960489d39dab49122df68918b1
Delegated to: Kumar Gala
Headers show

Comments

Michael Neuling - April 15, 2013, 5:42 a.m.
Linux next is currently failing to compile mpc85xx_defconfig with:
  arch/powerpc/sysdev/fsl_pci.c:944:2: error: too many arguments to function 'setup_pci_atmu'

This is caused by (from Kumar's next branch):
  commit 34642bbb3d12121333efcf4ea7dfe66685e403a1
  Author: Kumar Gala <galak@kernel.crashing.org>
  powerpc/fsl-pci: Keep PCI SoC controller registers in pci_controller

Which changed definition of setup_pci_atmu() but didn't update one of
the callers.  Below fixes this.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
Kumar: this is for your next tree
Kim Phillips - April 15, 2013, 4:30 p.m.
On Mon, 15 Apr 2013 15:42:01 +1000
Michael Neuling <mikey@neuling.org> wrote:

> Linux next is currently failing to compile mpc85xx_defconfig with:
>   arch/powerpc/sysdev/fsl_pci.c:944:2: error: too many arguments to function 'setup_pci_atmu'
> 
> This is caused by (from Kumar's next branch):
>   commit 34642bbb3d12121333efcf4ea7dfe66685e403a1
>   Author: Kumar Gala <galak@kernel.crashing.org>
>   powerpc/fsl-pci: Keep PCI SoC controller registers in pci_controller
> 
> Which changed definition of setup_pci_atmu() but didn't update one of
> the callers.  Below fixes this.
> 
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> Kumar: this is for your next tree

Reviewed-by: Kim Phillips <kim.phillips@freescale.com>

Thanks,

Kim
Stephen Rothwell - April 29, 2013, 11:06 p.m.
Hi Kumar,

On Mon, 15 Apr 2013 15:42:01 +1000 Michael Neuling <mikey@neuling.org> wrote:
>
> Linux next is currently failing to compile mpc85xx_defconfig with:
>   arch/powerpc/sysdev/fsl_pci.c:944:2: error: too many arguments to function 'setup_pci_atmu'
> 
> This is caused by (from Kumar's next branch):
>   commit 34642bbb3d12121333efcf4ea7dfe66685e403a1
>   Author: Kumar Gala <galak@kernel.crashing.org>
>   powerpc/fsl-pci: Keep PCI SoC controller registers in pci_controller
> 
> Which changed definition of setup_pci_atmu() but didn't update one of
> the callers.  Below fixes this.
> 
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> Kumar: this is for your next tree
> 
> diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
> index 83918c3..a10a036 100644
> --- a/arch/powerpc/sysdev/fsl_pci.c
> +++ b/arch/powerpc/sysdev/fsl_pci.c
> @@ -941,7 +941,7 @@ static int fsl_pci_resume(struct device *dev)
>  		return -ENODEV;
>  	}
>  
> -	setup_pci_atmu(hose, &pci_rsrc);
> +	setup_pci_atmu(hose);
>  
>  	return 0;
>  }
> 

This is still not in your tree ...
Benjamin Herrenschmidt - April 30, 2013, 1:08 a.m.
On Tue, 2013-04-30 at 09:06 +1000, Stephen Rothwell wrote:

> 
> This is still not in your tree ...

I'll apply it after I merge kumar stuff.

Cheers,
Ben.

Patch

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 83918c3..a10a036 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -941,7 +941,7 @@  static int fsl_pci_resume(struct device *dev)
 		return -ENODEV;
 	}
 
-	setup_pci_atmu(hose, &pci_rsrc);
+	setup_pci_atmu(hose);
 
 	return 0;
 }