diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:00 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:00 -0400 |
commit | 19df0d1169b3ddcc84933794d1401aaafe2f0000 (patch) | |
tree | 3548b6899e921056de3aaf76840fe4bb8863e1ac | |
parent | 6b5bf509317c013ea0a7c166affc1d4631720d85 (diff) |
[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.
This is to break the code of people who think they are supposed to scribble
into the pci device structure - it's off limits.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
28 files changed, 29 insertions, 28 deletions
diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c index c6cd6e9cdfbc..45224fd2c7ba 100644 --- a/arch/mips/pci/fixup-atlas.c +++ b/arch/mips/pci/fixup-atlas.c | |||
@@ -58,7 +58,7 @@ static char irq_tab[][5] __initdata = { | |||
58 | {0, 0, 0, 0, 0 } /* 21: Unused */ | 58 | {0, 0, 0, 0, 0 } /* 21: Unused */ |
59 | }; | 59 | }; |
60 | 60 | ||
61 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 61 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
62 | { | 62 | { |
63 | return irq_tab[slot][pin]; | 63 | return irq_tab[slot][pin]; |
64 | } | 64 | } |
diff --git a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c index c2f8304fe55b..ca0276c8070a 100644 --- a/arch/mips/pci/fixup-au1000.c +++ b/arch/mips/pci/fixup-au1000.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | extern char irq_tab_alchemy[][5]; | 36 | extern char irq_tab_alchemy[][5]; |
37 | 37 | ||
38 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 38 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
39 | { | 39 | { |
40 | return irq_tab_alchemy[slot][pin]; | 40 | return irq_tab_alchemy[slot][pin]; |
41 | } | 41 | } |
diff --git a/arch/mips/pci/fixup-capcella.c b/arch/mips/pci/fixup-capcella.c index 1e530751936c..1416bca6d1a3 100644 --- a/arch/mips/pci/fixup-capcella.c +++ b/arch/mips/pci/fixup-capcella.c | |||
@@ -38,7 +38,7 @@ static char irq_tab_capcella[][5] __initdata = { | |||
38 | [14] = { -1, INTA, INTB, INTC, INTD } | 38 | [14] = { -1, INTA, INTB, INTC, INTD } |
39 | }; | 39 | }; |
40 | 40 | ||
41 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 41 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
42 | { | 42 | { |
43 | return irq_tab_capcella[slot][pin]; | 43 | return irq_tab_capcella[slot][pin]; |
44 | } | 44 | } |
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c index d57ffd7242ca..7fc475f7eae5 100644 --- a/arch/mips/pci/fixup-cobalt.c +++ b/arch/mips/pci/fixup-cobalt.c | |||
@@ -161,7 +161,7 @@ static char irq_tab_raq2[] __initdata = { | |||
161 | [COBALT_PCICONF_ETH1] = COBALT_ETH1_IRQ | 161 | [COBALT_PCICONF_ETH1] = COBALT_ETH1_IRQ |
162 | }; | 162 | }; |
163 | 163 | ||
164 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 164 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
165 | { | 165 | { |
166 | if (cobalt_board_id < COBALT_BRD_ID_QUBE2) | 166 | if (cobalt_board_id < COBALT_BRD_ID_QUBE2) |
167 | return irq_tab_qube1[slot]; | 167 | return irq_tab_qube1[slot]; |
diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c index 7abcfd175d43..a2705895561d 100644 --- a/arch/mips/pci/fixup-emma2rh.c +++ b/arch/mips/pci/fixup-emma2rh.c | |||
@@ -89,7 +89,7 @@ static void __devinit emma2rh_pci_host_fixup(struct pci_dev *dev) | |||
89 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH, | 89 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH, |
90 | emma2rh_pci_host_fixup); | 90 | emma2rh_pci_host_fixup); |
91 | 91 | ||
92 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 92 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
93 | { | 93 | { |
94 | return irq_map[slot][pin]; | 94 | return irq_map[slot][pin]; |
95 | } | 95 | } |
diff --git a/arch/mips/pci/fixup-excite.c b/arch/mips/pci/fixup-excite.c index 1da696d43f00..cd64d9f177c4 100644 --- a/arch/mips/pci/fixup-excite.c +++ b/arch/mips/pci/fixup-excite.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
22 | #include <excite.h> | 22 | #include <excite.h> |
23 | 23 | ||
24 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 24 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
25 | { | 25 | { |
26 | if (pin == 0) | 26 | if (pin == 0) |
27 | return -1; | 27 | return -1; |
diff --git a/arch/mips/pci/fixup-ip32.c b/arch/mips/pci/fixup-ip32.c index 3e66b0aa63ca..190fffd08d3e 100644 --- a/arch/mips/pci/fixup-ip32.c +++ b/arch/mips/pci/fixup-ip32.c | |||
@@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = { | |||
39 | * irqs. I suppose a device without a pin A will thank us for doing it | 39 | * irqs. I suppose a device without a pin A will thank us for doing it |
40 | * right if there exists such a broken piece of crap. | 40 | * right if there exists such a broken piece of crap. |
41 | */ | 41 | */ |
42 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 42 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
43 | { | 43 | { |
44 | return irq_tab_mace[slot][pin]; | 44 | return irq_tab_mace[slot][pin]; |
45 | } | 45 | } |
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c index 73d18503517c..e974394be7bc 100644 --- a/arch/mips/pci/fixup-jmr3927.c +++ b/arch/mips/pci/fixup-jmr3927.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #include <asm/jmr3927/jmr3927.h> | 34 | #include <asm/jmr3927/jmr3927.h> |
35 | 35 | ||
36 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 36 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
37 | { | 37 | { |
38 | unsigned char irq = pin; | 38 | unsigned char irq = pin; |
39 | 39 | ||
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c index bf2c41d1e9c5..0f48498bc231 100644 --- a/arch/mips/pci/fixup-malta.c +++ b/arch/mips/pci/fixup-malta.c | |||
@@ -36,7 +36,7 @@ static char irq_tab[][5] __initdata = { | |||
36 | {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ | 36 | {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ |
37 | }; | 37 | }; |
38 | 38 | ||
39 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 39 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
40 | { | 40 | { |
41 | int virq; | 41 | int virq; |
42 | virq = irq_tab[slot][pin]; | 42 | virq = irq_tab[slot][pin]; |
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c index 3c9ae41f7517..591159625722 100644 --- a/arch/mips/pci/fixup-mpc30x.c +++ b/arch/mips/pci/fixup-mpc30x.c | |||
@@ -34,7 +34,7 @@ static const int irq_tab_mpc30x[] __initdata = { | |||
34 | [29] = MQ200_IRQ, | 34 | [29] = MQ200_IRQ, |
35 | }; | 35 | }; |
36 | 36 | ||
37 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 37 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
38 | { | 38 | { |
39 | if (slot == 30) | 39 | if (slot == 30) |
40 | return internal_func_irqs[PCI_FUNC(dev->devfn)]; | 40 | return internal_func_irqs[PCI_FUNC(dev->devfn)]; |
diff --git a/arch/mips/pci/fixup-ocelot-c.c b/arch/mips/pci/fixup-ocelot-c.c index d45494807a33..6616648712c2 100644 --- a/arch/mips/pci/fixup-ocelot-c.c +++ b/arch/mips/pci/fixup-ocelot-c.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | 21 | ||
22 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 22 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
23 | { | 23 | { |
24 | int bus = dev->bus->number; | 24 | int bus = dev->bus->number; |
25 | 25 | ||
diff --git a/arch/mips/pci/fixup-ocelot3.c b/arch/mips/pci/fixup-ocelot3.c index ececc03ec620..702f997b8673 100644 --- a/arch/mips/pci/fixup-ocelot3.c +++ b/arch/mips/pci/fixup-ocelot3.c | |||
@@ -23,7 +23,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev) | |||
23 | return 0; | 23 | return 0; |
24 | } | 24 | } |
25 | 25 | ||
26 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 26 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
27 | { | 27 | { |
28 | int bus = dev->bus->number; | 28 | int bus = dev->bus->number; |
29 | 29 | ||
diff --git a/arch/mips/pci/fixup-pnx8550.c b/arch/mips/pci/fixup-pnx8550.c index 50546dab6689..96857ac63bf5 100644 --- a/arch/mips/pci/fixup-pnx8550.c +++ b/arch/mips/pci/fixup-pnx8550.c | |||
@@ -45,7 +45,7 @@ void __init pcibios_fixup(void) | |||
45 | /* nothing to do here */ | 45 | /* nothing to do here */ |
46 | } | 46 | } |
47 | 47 | ||
48 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 48 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
49 | { | 49 | { |
50 | return pnx8550_irq_tab[slot][pin]; | 50 | return pnx8550_irq_tab[slot][pin]; |
51 | } | 51 | } |
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c index ceeb1860895a..3cdbecb8e714 100644 --- a/arch/mips/pci/fixup-rbtx4927.c +++ b/arch/mips/pci/fixup-rbtx4927.c | |||
@@ -119,7 +119,7 @@ int pci_get_irq(struct pci_dev *dev, int pin) | |||
119 | return irq; | 119 | return irq; |
120 | } | 120 | } |
121 | 121 | ||
122 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 122 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
123 | { | 123 | { |
124 | unsigned char irq; | 124 | unsigned char irq; |
125 | 125 | ||
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c index 36e5fb1b3786..a45bedd17233 100644 --- a/arch/mips/pci/fixup-sni.c +++ b/arch/mips/pci/fixup-sni.c | |||
@@ -120,7 +120,7 @@ static inline int is_rm300_revd(void) | |||
120 | return (csmsr & 0xa0) == 0x20; | 120 | return (csmsr & 0xa0) == 0x20; |
121 | } | 121 | } |
122 | 122 | ||
123 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 123 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
124 | { | 124 | { |
125 | switch (sni_brd_type) { | 125 | switch (sni_brd_type) { |
126 | case SNI_BRD_PCI_TOWER: | 126 | case SNI_BRD_PCI_TOWER: |
diff --git a/arch/mips/pci/fixup-tb0219.c b/arch/mips/pci/fixup-tb0219.c index 734f2b71e164..720a2b720c5c 100644 --- a/arch/mips/pci/fixup-tb0219.c +++ b/arch/mips/pci/fixup-tb0219.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include <asm/vr41xx/tb0219.h> | 24 | #include <asm/vr41xx/tb0219.h> |
25 | 25 | ||
26 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 26 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
27 | { | 27 | { |
28 | int irq = -1; | 28 | int irq = -1; |
29 | 29 | ||
diff --git a/arch/mips/pci/fixup-tb0226.c b/arch/mips/pci/fixup-tb0226.c index c9e7cb4361a1..e3eedf4bf9bd 100644 --- a/arch/mips/pci/fixup-tb0226.c +++ b/arch/mips/pci/fixup-tb0226.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/vr41xx/giu.h> | 23 | #include <asm/vr41xx/giu.h> |
24 | #include <asm/vr41xx/tb0226.h> | 24 | #include <asm/vr41xx/tb0226.h> |
25 | 25 | ||
26 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 26 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
27 | { | 27 | { |
28 | int irq = -1; | 28 | int irq = -1; |
29 | 29 | ||
diff --git a/arch/mips/pci/fixup-tb0287.c b/arch/mips/pci/fixup-tb0287.c index fbe6bcb28199..267ab3dc3d42 100644 --- a/arch/mips/pci/fixup-tb0287.c +++ b/arch/mips/pci/fixup-tb0287.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include <asm/vr41xx/tb0287.h> | 23 | #include <asm/vr41xx/tb0287.h> |
24 | 24 | ||
25 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 25 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
26 | { | 26 | { |
27 | unsigned char bus; | 27 | unsigned char bus; |
28 | int irq = -1; | 28 | int irq = -1; |
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-tx4938.c index f455520ada88..2485f47dfe6f 100644 --- a/arch/mips/pci/fixup-tx4938.c +++ b/arch/mips/pci/fixup-tx4938.c | |||
@@ -69,7 +69,7 @@ int pci_get_irq(struct pci_dev *dev, int pin) | |||
69 | return irq; | 69 | return irq; |
70 | } | 70 | } |
71 | 71 | ||
72 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 72 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
73 | { | 73 | { |
74 | unsigned char irq = 0; | 74 | unsigned char irq = 0; |
75 | 75 | ||
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c index a8d9d22b13df..de5e5f6bbf4c 100644 --- a/arch/mips/pci/fixup-vr4133.c +++ b/arch/mips/pci/fixup-vr4133.c | |||
@@ -169,7 +169,7 @@ void i8259_init(void) | |||
169 | } | 169 | } |
170 | #endif | 170 | #endif |
171 | 171 | ||
172 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 172 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
173 | { | 173 | { |
174 | extern int pci_probe_only; | 174 | extern int pci_probe_only; |
175 | pci_probe_only = 1; | 175 | pci_probe_only = 1; |
diff --git a/arch/mips/pci/fixup-wrppmc.c b/arch/mips/pci/fixup-wrppmc.c index 3357c1300bb1..3d277549d5df 100644 --- a/arch/mips/pci/fixup-wrppmc.c +++ b/arch/mips/pci/fixup-wrppmc.c | |||
@@ -25,7 +25,7 @@ static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata = { | |||
25 | [6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0}, | 25 | [6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0}, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 28 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
29 | { | 29 | { |
30 | return pci_irq_tab[slot][pin]; | 30 | return pci_irq_tab[slot][pin]; |
31 | } | 31 | } |
diff --git a/arch/mips/pci/fixup-yosemite.c b/arch/mips/pci/fixup-yosemite.c index 81d77a587a51..fdafb13a793b 100644 --- a/arch/mips/pci/fixup-yosemite.c +++ b/arch/mips/pci/fixup-yosemite.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | 28 | ||
29 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 29 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
30 | { | 30 | { |
31 | if (pin == 0) | 31 | if (pin == 0) |
32 | return -1; | 32 | return -1; |
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index d7b9e1349f6d..2b4e30c7d105 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
@@ -74,8 +74,9 @@ static inline void WRITECFG32(u32 addr, u32 data) | |||
74 | *(u32 *)(cfg_space + (addr & ~3)) = data; | 74 | *(u32 *)(cfg_space + (addr & ~3)) = data; |
75 | } | 75 | } |
76 | 76 | ||
77 | int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 77 | int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
78 | { | 78 | { |
79 | This is b0rked. | ||
79 | return dev->irq; | 80 | return dev->irq; |
80 | } | 81 | } |
81 | 82 | ||
diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c index d071bc375b11..7363e1877842 100644 --- a/arch/mips/pci/pci-ddb5477.c +++ b/arch/mips/pci/pci-ddb5477.c | |||
@@ -131,7 +131,7 @@ static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = { | |||
131 | /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */ | 131 | /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */ |
132 | }; | 132 | }; |
133 | 133 | ||
134 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 134 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
135 | { | 135 | { |
136 | int slot_num; | 136 | int slot_num; |
137 | unsigned char *slot_irq_map; | 137 | unsigned char *slot_irq_map; |
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index 405ce0152739..a322543ac34e 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
@@ -134,7 +134,7 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
134 | * A given PCI device, in general, should be able to intr any of the cpus | 134 | * A given PCI device, in general, should be able to intr any of the cpus |
135 | * on any one of the hubs connected to its xbow. | 135 | * on any one of the hubs connected to its xbow. |
136 | */ | 136 | */ |
137 | int __devinit pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 137 | int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
138 | { | 138 | { |
139 | struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus); | 139 | struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus); |
140 | int irq = bc->pci_int[slot]; | 140 | int irq = bc->pci_int[slot]; |
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c index 985784a3e6f8..c5045ff3ad8c 100644 --- a/arch/mips/pci/pci-lasat.c +++ b/arch/mips/pci/pci-lasat.c | |||
@@ -64,7 +64,7 @@ arch_initcall(lasat_pci_setup); | |||
64 | #define LASATINT_PCIC 7 | 64 | #define LASATINT_PCIC 7 |
65 | #define LASATINT_PCID 8 | 65 | #define LASATINT_PCID 8 |
66 | 66 | ||
67 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 67 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
68 | { | 68 | { |
69 | switch (slot) { | 69 | switch (slot) { |
70 | case 1: | 70 | case 1: |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 75c1246ced5f..c1ac6493155e 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
@@ -84,7 +84,7 @@ static inline void WRITECFG32(u32 addr, u32 data) | |||
84 | *(u32 *) (cfg_space + (addr & ~3)) = data; | 84 | *(u32 *) (cfg_space + (addr & ~3)) = data; |
85 | } | 85 | } |
86 | 86 | ||
87 | int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 87 | int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
88 | { | 88 | { |
89 | return dev->irq; | 89 | return dev->irq; |
90 | } | 90 | } |
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index 3eea3ba0fca5..a59d54749eef 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
@@ -56,7 +56,7 @@ extern void register_pci_controller(struct pci_controller *hose); | |||
56 | /* | 56 | /* |
57 | * board supplied pci irq fixup routine | 57 | * board supplied pci irq fixup routine |
58 | */ | 58 | */ |
59 | extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin); | 59 | extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); |
60 | 60 | ||
61 | 61 | ||
62 | /* Can be used to override the logic in pci_scan_bus for skipping | 62 | /* Can be used to override the logic in pci_scan_bus for skipping |