Fix warning: incompatible argument type of pci_fixup_irqs
PATCH 1/30 Fix warning: incompatible argument type of pci_fixup_irqs
From 1e6360e89b239699ef1f5344e1d3a5c0b3c5bef1 Mon Sep 17 00:00:00 2001
From: Wu Zhangjin <[email protected]>
Date: Tue, 12 May 2009 10:33:37 +0800
Subject: [PATCH 01/30] Fix warning: incompatible argument type of pci_fixup_irqs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
arch/mips/pci/pci.c:160: warning: passing argument 2 of ‘pci_fixup_irqs’ from incompatible pointer type
include/linux/pci.h:
void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
int (*)(struct pci_dev *, u8, u8));arch/mips/pci/pci.c:160:
pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq);
arch/mips/include/asm/pci.h:
extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
arch/mips/pci/fixup-malta.c
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
--- arch/mips/include/asm/pci.h | 2 +- arch/mips/pci/fixup-au1000.c | 2 +- arch/mips/pci/fixup-capcella.c | 2 +- arch/mips/pci/fixup-cobalt.c | 2 +- arch/mips/pci/fixup-emma2rh.c | 2 +- arch/mips/pci/fixup-excite.c | 2 +- arch/mips/pci/fixup-ip32.c | 2 +- arch/mips/pci/fixup-lm2e.c | 2 +- arch/mips/pci/fixup-malta.c | 2 +- arch/mips/pci/fixup-mpc30x.c | 2 +- arch/mips/pci/fixup-pmcmsp.c | 2 +- arch/mips/pci/fixup-pnx8550.c | 2 +- arch/mips/pci/fixup-rc32434.c | 2 +- arch/mips/pci/fixup-sni.c | 2 +- arch/mips/pci/fixup-tb0219.c | 2 +- arch/mips/pci/fixup-tb0226.c | 2 +- arch/mips/pci/fixup-tb0287.c | 2 +- arch/mips/pci/fixup-wrppmc.c | 2 +- arch/mips/pci/fixup-yosemite.c | 2 +- arch/mips/pci/pci-bcm1480.c | 2 +- arch/mips/pci/pci-bcm47xx.c | 2 +- arch/mips/pci/pci-ip27.c | 2 +- arch/mips/pci/pci-lasat.c | 2 +- arch/mips/pci/pci-sb1250.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)
arch/mips/include/asm/pci.h +0 -0
@@ -56,7 +56,7 @@ extern void register_pci_controller(struct
pci_controller *hose);
/*
* board supplied pci irq fixup routine
*/
-extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); +extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
/* Can be used to override the logic in pci_scan_bus for skipping
arch/mips/pci/fixup-au1000.c +1 -1
@@ -31,7 +31,7 @@extern char irq_tab_alchemy[][5 ]; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return irq_tab_alchemy[slot][pin]; }
(quoted diff) +0 -0
b/arch/mips/pci/fixup-capcella.c
index 1416bca..1e53075 100644
arch/mips/pci/fixup-capcella.c +1 -1
@@ -38,7 +38,7 @@ static char irq_tab_capcella[][5] __initdata = { [14] = { -1, INTA, INTB, INTC, INTD } }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return irq_tab_capcella[slot][pin]; }
arch/mips/pci/fixup-cobalt.c +1 -1
@@ -175,7 +175,7 @@ static char irq_tab_raq2[] __initdata = { [COBALT_PCICONF_ETH1] = ETH1_IRQ }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {if (cobalt_board_id <=COBALT_BRD_ID_QUBE1 )return irq_tab_qube1[slot];
(quoted diff) +0 -0
b/arch/mips/pci/fixup-emma2rh.c
index fba5aad..04c28f3 100644
arch/mips/pci/fixup-emma2rh.c +0 -0
@@ -88,7 +88,7 @@ static void __devinit emma2rh_pci_host_fixup(struct
pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,
emma2rh_pci_host_fixup);
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
return irq_map[slot][pin];
}
arch/mips/pci/fixup-excite.c +1 -1
@@ -21,7 +21,7 @@#include <linux/pci.h> #include <excite.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {if (pin ==0 )return -1 ;
arch/mips/pci/fixup-ip32.c +1 -1
@@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = {* irqs. I suppose a device without a pin A will thank us for doing it * right if there exists such a broken piece of crap. */ -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return irq_tab_mace[slot][pin]; }
arch/mips/pci/fixup-lm2e.c +1 -1
@@ -36,7 +36,7 @@/* South bridge slot number is set by the pci probe process */ static u8 sb_slot =5 ; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {int irq =0 ;
arch/mips/pci/fixup-malta.c +1 -1
@@ -36,7 +36,7 @@ static char irq_tab[][5] __initdata = { {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {int virq; virq = irq_tab[slot][pin];
arch/mips/pci/fixup-mpc30x.c +1 -1
@@ -34,7 +34,7 @@ static const int irq_tab_mpc30x[] __initdata = { [29] = MQ200_IRQ, }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {if (slot ==30 )return internal_func_irqs[PCI_FUNC (dev->devfn)];
arch/mips/pci/fixup-pmcmsp.c +0 -0
@@ -202,7 +202,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)* RETURNS: IRQ number *
****************************************************************************/ -int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
#if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL)
printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n");
(quoted diff) +0 -0
b/arch/mips/pci/fixup-pnx8550.c
index 96857ac..50546da 100644
arch/mips/pci/fixup-pnx8550.c +1 -1
@@ -45,7 +45,7 @@ void __init pcibios_fixup(void)/* nothing to do here */ } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return pnx8550_irq_tab[slot][pin]; }
(quoted diff) +0 -0
b/arch/mips/pci/fixup-rc32434.c
index 3d86823..68f8537 100644
arch/mips/pci/fixup-rc32434.c +0 -1
@@ -37,7 +37,7 @@ static int __devinitdata irq_map[2][12] = { {0, 0, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3} }; -int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8
pin)
+int __devinit pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
int irq = 0;
arch/mips/pci/fixup-sni.c +1 -1
@@ -130,7 +130,7 @@ static inline int is_rm300_revd(void)return (csmsr &0xa0 ) ==0x20 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {switch (sni_brd_type) {case SNI_BRD_PCI_TOWER_CPLUS :
arch/mips/pci/fixup-tb0219.c +1 -1
@@ -23,7 +23,7 @@#include <asm/vr41xx/tb0219.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {int irq =-1 ;
arch/mips/pci/fixup-tb0226.c +1 -1
@@ -23,7 +23,7 @@#include <asm/vr41xx/giu.h> #include <asm/vr41xx/tb0226.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {int irq =-1 ;
arch/mips/pci/fixup-tb0287.c +1 -1
@@ -22,7 +22,7 @@#include <asm/vr41xx/tb0287.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {unsigned char bus;int irq =-1 ;
arch/mips/pci/fixup-wrppmc.c +0 -0
@@ -25,7 +25,7 @@ static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata
= {
[6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0},
};
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
return pci_irq_tab[slot][pin];
}
(quoted diff) +0 -0
b/arch/mips/pci/fixup-yosemite.c
index fdafb13..81d77a5 100644
arch/mips/pci/fixup-yosemite.c +1 -1
@@ -26,7 +26,7 @@#include <linux/init.h> #include <linux/pci.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {if (pin ==0 )return -1 ;
arch/mips/pci/pci-bcm1480.c +1 -1
@@ -74,7 +74,7 @@ static inline void WRITECFG32(u32 addr, u32 data) *(u32 *)(cfg_space + (addr & ~3 )) = data; } -int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {if (pin ==0 )return -1 ;
arch/mips/pci/pci-bcm47xx.c +1 -1
@@ -26,7 +26,7 @@#include <linux/pci.h> #include <linux/ssb/ssb.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return 0 ; }
arch/mips/pci/pci-ip27.c +0 -0
@@ -141,7 +141,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int
widget_id, int masterwid)
* A given PCI device, in general, should be able to intr any of the
cpus
* on any one of the hubs connected to its xbow.
*/
-int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int __devinit pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
return 0;
}
arch/mips/pci/pci-lasat.c +1 -1
@@ -61,7 +61,7 @@ arch_initcall(lasat_pci_setup);#define LASAT_IRQ_PCIC (LASAT_IRQ_BASE + 7)#define LASAT_IRQ_PCID (LASAT_IRQ_BASE + 8) -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {switch (slot) {case 1 :
arch/mips/pci/pci-sb1250.c +1 -1
@@ -84,7 +84,7 @@ static inline void WRITECFG32(u32 addr, u32 data) *(u32 *) (cfg_space + (addr & ~3 )) = data; } -int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return dev->irq; }
arch/mips/txx9/generic/pci.c +1 -1
@@ -382,7 +382,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)return 0 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int __init pcibios_map_irq (struct pci_dev *dev,u8 slot,u8 pin) {return txx9_board_vec->pci_map_irq (dev, slot, pin); }
Signature · 1 line
1.6.2.1
Quoted 47 lines · Wu Zhangjin
Quoted 1 line
From
1e6360e89b239699ef1f5344e1d3a5c0b3c5bef1Mon Sep 17 00:00:00 2001From: Wu Zhangjin <[email protected]>
Date: Tue, 12 May 2009 10:33:37 +0800
Subject: [PATCH 01/30] Fix warning: incompatible argument type ofpci_fixup_irqs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
arch/mips/pci/pci.c:160: warning: passing argument 2 of ‘pci_fixup_irqs’ from incompatible pointer type
include/linux/pci.h:void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8));
arch/mips/pci/pci.c:160:pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq);
arch/mips/include/asm/pci.h:extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
arch/mips/pci/fixup-malta.cint
__initpcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)--- arch/mips/include/asm/pci.h | 2 +- arch/mips/pci/fixup-au1000.c | 2 +- arch/mips/pci/fixup-capcella.c | 2 +- arch/mips/pci/fixup-cobalt.c | 2 +- arch/mips/pci/fixup-emma2rh.c | 2 +- arch/mips/pci/fixup-excite.c | 2 +- arch/mips/pci/fixup-ip32.c | 2 +- arch/mips/pci/fixup-lm2e.c | 2 +- arch/mips/pci/fixup-malta.c | 2 +- arch/mips/pci/fixup-mpc30x.c | 2 +- arch/mips/pci/fixup-pmcmsp.c | 2 +- arch/mips/pci/fixup-pnx8550.c | 2 +- arch/mips/pci/fixup-rc32434.c | 2 +- arch/mips/pci/fixup-sni.c | 2 +- arch/mips/pci/fixup-tb0219.c | 2 +- arch/mips/pci/fixup-tb0226.c | 2 +- arch/mips/pci/fixup-tb0287.c | 2 +- arch/mips/pci/fixup-wrppmc.c | 2 +-
Quoted 9 lines
arch/mips/pci/fixup-yosemite.c | 2 +- arch/mips/pci/pci-bcm1480.c | 2 +- arch/mips/pci/pci-bcm47xx.c | 2 +- arch/mips/pci/pci-ip27.c | 2 +- arch/mips/pci/pci-lasat.c | 2 +- arch/mips/pci/pci-sb1250.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)
[...]
Did you intend that we should do something with all these patches?
They cannot be merged without a Signed-off-by: tag. There may be other issues as well. Did you run checkpatch.pl on them? If not, I would recommend it. Try to fix all errors flagged by checkpatch.
This is what I get on this patch:
ERROR: patch seems to be corrupt (line wrapped?)
#130: FILE: arch/mips/include/asm/pci.h:55:pci_controller *hose);
ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 0 warnings, 293 lines checked
[PATCH 01_30] Fix warning: incompatible argument type of pci_fixup_irqs.eml has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
David Daney
Quoted 57 lines · David Daney
Quoted 47 lines · Wu Zhangjin
Quoted 1 line
From
1e6360e89b239699ef1f5344e1d3a5c0b3c5bef1Mon Sep 17 00:00:00 2001From: Wu Zhangjin <[email protected]>
Date: Tue, 12 May 2009 10:33:37 +0800
Subject: [PATCH 01/30] Fix warning: incompatible argument type ofpci_fixup_irqs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
arch/mips/pci/pci.c:160: warning: passing argument 2 ofpci_fixup_irqsfrom incompatible pointer type
include/linux/pci.h:void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8));
arch/mips/pci/pci.c:160:pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq);
arch/mips/include/asm/pci.h:extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
arch/mips/pci/fixup-malta.cint
__initpcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)--- arch/mips/include/asm/pci.h | 2 +- arch/mips/pci/fixup-au1000.c | 2 +- arch/mips/pci/fixup-capcella.c | 2 +- arch/mips/pci/fixup-cobalt.c | 2 +- arch/mips/pci/fixup-emma2rh.c | 2 +- arch/mips/pci/fixup-excite.c | 2 +- arch/mips/pci/fixup-ip32.c | 2 +- arch/mips/pci/fixup-lm2e.c | 2 +- arch/mips/pci/fixup-malta.c | 2 +- arch/mips/pci/fixup-mpc30x.c | 2 +- arch/mips/pci/fixup-pmcmsp.c | 2 +- arch/mips/pci/fixup-pnx8550.c | 2 +- arch/mips/pci/fixup-rc32434.c | 2 +- arch/mips/pci/fixup-sni.c | 2 +- arch/mips/pci/fixup-tb0219.c | 2 +- arch/mips/pci/fixup-tb0226.c | 2 +- arch/mips/pci/fixup-tb0287.c | 2 +- arch/mips/pci/fixup-wrppmc.c | 2 +-Quoted 9 lines
arch/mips/pci/fixup-yosemite.c | 2 +- arch/mips/pci/pci-bcm1480.c | 2 +- arch/mips/pci/pci-bcm47xx.c | 2 +- arch/mips/pci/pci-ip27.c | 2 +- arch/mips/pci/pci-lasat.c | 2 +- arch/mips/pci/pci-sb1250.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)
Quoted 7 lines
[...]
Did you intend that we should do something with all these patches?
They cannot be merged without a Signed-off-by: tag. There may be other issues as well. Did you run checkpatch.pl on them? If not, I would recommend it. Try to fix all errors flagged by checkpatch.
sorry, forget to check it. I will do it later, thanks!
Quoted 21 lines
This is what I get on this patch:
ERROR: patch seems to be corrupt (line wrapped?)
#130: FILE:arch/mips/include/asm/pci.h:55:pci_controller*hose);ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 0 warnings, 293 lines checked
[PATCH 01_30] Fix warning: incompatible argument type of pci_fixup_irqs.eml has style problems, please review. If any of these errors
are false positives report them to the maintainer, see CHECKPATCH inMAINTAINERS.David Daney
Quoted 8 lines · Wu Zhangjin
Quoted 1 line
From
1e6360e89b239699ef1f5344e1d3a5c0b3c5bef1Mon Sep 17 00:00:00 2001From: Wu Zhangjin <[email protected]>
Date: Tue, 12 May 2009 10:33:37 +0800
Subject: [PATCH 01/30] Fix warning: incompatible argument type ofpci_fixup_irqs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
I don't know how you mailed these patches.
But it seems to me that you copy'n'pasted the format-patch'ed patch into the text editor of your mailer.
If this is the case, please don't do this. Please use 'git send-email'.
Otherwise, please ignore this mail and I am sorry for the noise.
Signature · 4 lines
Zhang, Le Gentoo/Loongson Developer http://zhangle.is-a-geek.org 0260 C902 B8F8 6506 6586 2B90 BC51 C808 1E4E 2973
Quoted 10 lines · Zhang Le
Quoted 8 lines · Wu Zhangjin
Quoted 1 line
From
1e6360e89b239699ef1f5344e1d3a5c0b3c5bef1Mon Sep 17 00:00:00 2001From: Wu Zhangjin <[email protected]>
Date: Tue, 12 May 2009 10:33:37 +0800
Subject: [PATCH 01/30] Fix warning: incompatible argument type ofpci_fixup_irqs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Quoted 5 lines
I don't know how you mailed these patches.
But it seems to me that you copy'n'pasted the format-patch'ed patch into the text editor of your mailer.If this is the case, please don't do this. Please use 'git send-email'.
thanks very much for your reply :-)
-----------------
hi, all
I am checking the posted patchset with the support of scripts/checkpatch.pl, and have cleaned up the cs55536 support of fuloong2f/yeeloong2f a lot.
the new patchset will come one day or two later(will be sent out via 'git send-email'), so, please ignore the posted patchset, I am very sorry for sending the awful patchset to you.
thanks,
Wu Zhangjin
Quoted 2 lines · Wu Zhangjin
the new patchset will come one day or two later(will be sent out via 'git send-email')
BTW, please also check 'man git-format-patch' for --cover-letter and --thread options.
Signature · 4 lines
Zhang, Le Gentoo/Loongson Developer http://zhangle.is-a-geek.org 0260 C902 B8F8 6506 6586 2B90 BC51 C808 1E4E 2973