linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc: fix usage of setup_pci_atmu()
       [not found] <1363201636-7318-1-git-send-email-galak@kernel.crashing.org>
@ 2013-04-15  5:42 ` Michael Neuling
  2013-04-15 16:30   ` Kim Phillips
  2013-04-29 23:06   ` Stephen Rothwell
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Neuling @ 2013-04-15  5:42 UTC (permalink / raw)
  To: Kumar Gala, sfr; +Cc: linuxppc-dev, linux-next, benh

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;
 }

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] powerpc: fix usage of setup_pci_atmu()
  2013-04-15  5:42 ` [PATCH] powerpc: fix usage of setup_pci_atmu() Michael Neuling
@ 2013-04-15 16:30   ` Kim Phillips
  2013-04-29 23:06   ` Stephen Rothwell
  1 sibling, 0 replies; 4+ messages in thread
From: Kim Phillips @ 2013-04-15 16:30 UTC (permalink / raw)
  To: Michael Neuling; +Cc: Kumar Gala, sfr, linuxppc-dev, linux-next

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] powerpc: fix usage of setup_pci_atmu()
  2013-04-15  5:42 ` [PATCH] powerpc: fix usage of setup_pci_atmu() Michael Neuling
  2013-04-15 16:30   ` Kim Phillips
@ 2013-04-29 23:06   ` Stephen Rothwell
  2013-04-30  1:08     ` Benjamin Herrenschmidt
  1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2013-04-29 23:06 UTC (permalink / raw)
  To: Kumar Gala; +Cc: Michael Neuling, linuxppc-dev, linux-next, benh

[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]

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 ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] powerpc: fix usage of setup_pci_atmu()
  2013-04-29 23:06   ` Stephen Rothwell
@ 2013-04-30  1:08     ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2013-04-30  1:08 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Kumar Gala, Michael Neuling, linuxppc-dev, linux-next

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-04-30  1:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1363201636-7318-1-git-send-email-galak@kernel.crashing.org>
2013-04-15  5:42 ` [PATCH] powerpc: fix usage of setup_pci_atmu() Michael Neuling
2013-04-15 16:30   ` Kim Phillips
2013-04-29 23:06   ` Stephen Rothwell
2013-04-30  1:08     ` Benjamin Herrenschmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).