diff mbox

arm: fix compile failure in orion5x/dns323-setup.c

Message ID 1312216934-29710-1-git-send-email-paul.gortmaker@windriver.com
State New, archived
Headers show

Commit Message

Paul Gortmaker Aug. 1, 2011, 4:42 p.m. UTC
Upstream commit d5341942d784134f2997b3ff82cd63cf71d1f932 "PCI: Make the
struct pci_dev * argument of pci_fixup_irqs const." leaked an extra
"const" into an actual call site (vs a proto/decl) which causes this:

arch/arm/mach-orion5x/dns323-setup.c: In function 'dns323_pci_map_irq':
arch/arm/mach-orion5x/dns323-setup.c:80: error: expected expression before 'const'
arch/arm/mach-orion5x/dns323-setup.c:80: error: too few arguments to function 'orion5x_pci_map_irq'
make[3]: *** [arch/arm/mach-orion5x/dns323-setup.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Comments

Nicolas Pitre Aug. 1, 2011, 5:26 p.m. UTC | #1
On Mon, 1 Aug 2011, Paul Gortmaker wrote:

> Upstream commit d5341942d784134f2997b3ff82cd63cf71d1f932 "PCI: Make the
> struct pci_dev * argument of pci_fixup_irqs const." leaked an extra
> "const" into an actual call site (vs a proto/decl) which causes this:
> 
> arch/arm/mach-orion5x/dns323-setup.c: In function 'dns323_pci_map_irq':
> arch/arm/mach-orion5x/dns323-setup.c:80: error: expected expression before 'const'
> arch/arm/mach-orion5x/dns323-setup.c:80: error: too few arguments to function 'orion5x_pci_map_irq'
> make[3]: *** [arch/arm/mach-orion5x/dns323-setup.o] Error 1
> 
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Acked-by: Nicolas Pitre <nico@fluxnic.net>
 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index a6eddae..c105556 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
>  	/*
>  	 * Check for devices with hard-wired IRQs.
>  	 */
> -	irq = orion5x_pci_map_irq(const dev, slot, pin);
> +	irq = orion5x_pci_map_irq(dev, slot, pin);
>  	if (irq != -1)
>  		return irq;
>  
> -- 
> 1.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
Ralf Baechle Aug. 2, 2011, 9:56 a.m. UTC | #2
On Mon, Aug 01, 2011 at 12:42:14PM -0400, Paul Gortmaker wrote:

> index a6eddae..c105556 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
>  	/*
>  	 * Check for devices with hard-wired IRQs.
>  	 */
> -	irq = orion5x_pci_map_irq(const dev, slot, pin);
> +	irq = orion5x_pci_map_irq(dev, slot, pin);

Very obviously correct ...

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf
Bryan Wu Aug. 24, 2011, 10:11 a.m. UTC | #3
Rob,

I guess you can add your Ack to Paul's patch here.

Arnd, could you please add this patch into your tree, as it's a
obvious right fixing.

Thanks,
-Bryan

On Tue, Aug 2, 2011 at 5:56 PM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Mon, Aug 01, 2011 at 12:42:14PM -0400, Paul Gortmaker wrote:
>
>> index a6eddae..c105556 100644
>> --- a/arch/arm/mach-orion5x/dns323-setup.c
>> +++ b/arch/arm/mach-orion5x/dns323-setup.c
>> @@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
>>       /*
>>        * Check for devices with hard-wired IRQs.
>>        */
>> -     irq = orion5x_pci_map_irq(const dev, slot, pin);
>> +     irq = orion5x_pci_map_irq(dev, slot, pin);
>
> Very obviously correct ...
>
> Acked-by: Ralf Baechle <ralf@linux-mips.org>
>
>  Ralf
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
diff mbox

Patch

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index a6eddae..c105556 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -77,7 +77,7 @@  static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 	/*
 	 * Check for devices with hard-wired IRQs.
 	 */
-	irq = orion5x_pci_map_irq(const dev, slot, pin);
+	irq = orion5x_pci_map_irq(dev, slot, pin);
 	if (irq != -1)
 		return irq;