[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>
This commit is contained in:
parent
6b5bf50931
commit
19df0d1169
28 changed files with 29 additions and 28 deletions
|
@ -58,7 +58,7 @@ static char irq_tab[][5] __initdata = {
|
||||||
{0, 0, 0, 0, 0 } /* 21: Unused */
|
{0, 0, 0, 0, 0 } /* 21: Unused */
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return irq_tab[slot][pin];
|
return irq_tab[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
extern char irq_tab_alchemy[][5];
|
extern char irq_tab_alchemy[][5];
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return irq_tab_alchemy[slot][pin];
|
return irq_tab_alchemy[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ static char irq_tab_capcella[][5] __initdata = {
|
||||||
[14] = { -1, INTA, INTB, INTC, INTD }
|
[14] = { -1, INTA, INTB, INTC, INTD }
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return irq_tab_capcella[slot][pin];
|
return irq_tab_capcella[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,7 @@ static char irq_tab_raq2[] __initdata = {
|
||||||
[COBALT_PCICONF_ETH1] = COBALT_ETH1_IRQ
|
[COBALT_PCICONF_ETH1] = COBALT_ETH1_IRQ
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
if (cobalt_board_id < COBALT_BRD_ID_QUBE2)
|
if (cobalt_board_id < COBALT_BRD_ID_QUBE2)
|
||||||
return irq_tab_qube1[slot];
|
return irq_tab_qube1[slot];
|
||||||
|
|
|
@ -89,7 +89,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,
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,
|
||||||
emma2rh_pci_host_fixup);
|
emma2rh_pci_host_fixup);
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return irq_map[slot][pin];
|
return irq_map[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <excite.h>
|
#include <excite.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
if (pin == 0)
|
if (pin == 0)
|
||||||
return -1;
|
return -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
|
* 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.
|
* right if there exists such a broken piece of crap.
|
||||||
*/
|
*/
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return irq_tab_mace[slot][pin];
|
return irq_tab_mace[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#include <asm/jmr3927/jmr3927.h>
|
#include <asm/jmr3927/jmr3927.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
unsigned char irq = pin;
|
unsigned char irq = pin;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ static char irq_tab[][5] __initdata = {
|
||||||
{0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */
|
{0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int virq;
|
int virq;
|
||||||
virq = irq_tab[slot][pin];
|
virq = irq_tab[slot][pin];
|
||||||
|
|
|
@ -34,7 +34,7 @@ static const int irq_tab_mpc30x[] __initdata = {
|
||||||
[29] = MQ200_IRQ,
|
[29] = MQ200_IRQ,
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
if (slot == 30)
|
if (slot == 30)
|
||||||
return internal_func_irqs[PCI_FUNC(dev->devfn)];
|
return internal_func_irqs[PCI_FUNC(dev->devfn)];
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int bus = dev->bus->number;
|
int bus = dev->bus->number;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int bus = dev->bus->number;
|
int bus = dev->bus->number;
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ void __init pcibios_fixup(void)
|
||||||
/* nothing to do here */
|
/* nothing to do here */
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return pnx8550_irq_tab[slot][pin];
|
return pnx8550_irq_tab[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ int pci_get_irq(struct pci_dev *dev, int pin)
|
||||||
return irq;
|
return irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
unsigned char irq;
|
unsigned char irq;
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ static inline int is_rm300_revd(void)
|
||||||
return (csmsr & 0xa0) == 0x20;
|
return (csmsr & 0xa0) == 0x20;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
switch (sni_brd_type) {
|
switch (sni_brd_type) {
|
||||||
case SNI_BRD_PCI_TOWER:
|
case SNI_BRD_PCI_TOWER:
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include <asm/vr41xx/tb0219.h>
|
#include <asm/vr41xx/tb0219.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int irq = -1;
|
int irq = -1;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <asm/vr41xx/giu.h>
|
#include <asm/vr41xx/giu.h>
|
||||||
#include <asm/vr41xx/tb0226.h>
|
#include <asm/vr41xx/tb0226.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int irq = -1;
|
int irq = -1;
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include <asm/vr41xx/tb0287.h>
|
#include <asm/vr41xx/tb0287.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
unsigned char bus;
|
unsigned char bus;
|
||||||
int irq = -1;
|
int irq = -1;
|
||||||
|
|
|
@ -69,7 +69,7 @@ int pci_get_irq(struct pci_dev *dev, int pin)
|
||||||
return irq;
|
return irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
unsigned char irq = 0;
|
unsigned char irq = 0;
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,7 @@ void i8259_init(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
extern int pci_probe_only;
|
extern int pci_probe_only;
|
||||||
pci_probe_only = 1;
|
pci_probe_only = 1;
|
||||||
|
|
|
@ -25,7 +25,7 @@ static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata = {
|
||||||
[6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0},
|
[6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return pci_irq_tab[slot][pin];
|
return pci_irq_tab[slot][pin];
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
if (pin == 0)
|
if (pin == 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -74,8 +74,9 @@ static inline void WRITECFG32(u32 addr, u32 data)
|
||||||
*(u32 *)(cfg_space + (addr & ~3)) = data;
|
*(u32 *)(cfg_space + (addr & ~3)) = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
|
This is b0rked.
|
||||||
return dev->irq;
|
return dev->irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = {
|
||||||
/* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
|
/* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
int slot_num;
|
int slot_num;
|
||||||
unsigned char *slot_irq_map;
|
unsigned char *slot_irq_map;
|
||||||
|
|
|
@ -134,7 +134,7 @@ int __init 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
|
* 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.
|
* on any one of the hubs connected to its xbow.
|
||||||
*/
|
*/
|
||||||
int __devinit pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus);
|
struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus);
|
||||||
int irq = bc->pci_int[slot];
|
int irq = bc->pci_int[slot];
|
||||||
|
|
|
@ -64,7 +64,7 @@ arch_initcall(lasat_pci_setup);
|
||||||
#define LASATINT_PCIC 7
|
#define LASATINT_PCIC 7
|
||||||
#define LASATINT_PCID 8
|
#define LASATINT_PCID 8
|
||||||
|
|
||||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
switch (slot) {
|
switch (slot) {
|
||||||
case 1:
|
case 1:
|
||||||
|
|
|
@ -84,7 +84,7 @@ static inline void WRITECFG32(u32 addr, u32 data)
|
||||||
*(u32 *) (cfg_space + (addr & ~3)) = data;
|
*(u32 *) (cfg_space + (addr & ~3)) = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
return dev->irq;
|
return dev->irq;
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ extern void register_pci_controller(struct pci_controller *hose);
|
||||||
/*
|
/*
|
||||||
* board supplied pci irq fixup routine
|
* board supplied pci irq fixup routine
|
||||||
*/
|
*/
|
||||||
extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
|
extern int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
|
||||||
|
|
||||||
|
|
||||||
/* Can be used to override the logic in pci_scan_bus for skipping
|
/* Can be used to override the logic in pci_scan_bus for skipping
|
||||||
|
|
Loading…
Add table
Reference in a new issue