Skip to content

L
linux
Commit 19df0d11 authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

[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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6b5bf509
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
arch/mips/pci/fixup-atlas.c
View file @ 19df0d11
...@@ -58,7 +58,7 @@ static char irq_tab[][5] __initdata = { ...@@ -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];
} }
......
arch/mips/pci/fixup-au1000.c
View file @ 19df0d11
...@@ -35,7 +35,7 @@ ...@@ -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];
} }
......
arch/mips/pci/fixup-capcella.c
View file @ 19df0d11
...@@ -38,7 +38,7 @@ static char irq_tab_capcella[][5] __initdata = { ...@@ -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];
} }
......
arch/mips/pci/fixup-cobalt.c
View file @ 19df0d11
...@@ -161,7 +161,7 @@ static char irq_tab_raq2[] __initdata = { ...@@ -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];
......
arch/mips/pci/fixup-emma2rh.c
View file @ 19df0d11
...@@ -89,7 +89,7 @@ static void __devinit emma2rh_pci_host_fixup(struct pci_dev *dev) ...@@ -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];
} }
......
arch/mips/pci/fixup-excite.c
View file @ 19df0d11
...@@ -21,7 +21,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-ip32.c
View file @ 19df0d11
...@@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = { ...@@ -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];
} }
......
arch/mips/pci/fixup-jmr3927.c
View file @ 19df0d11
...@@ -33,7 +33,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-malta.c
View file @ 19df0d11
...@@ -36,7 +36,7 @@ static char irq_tab[][5] __initdata = { ...@@ -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];
......
arch/mips/pci/fixup-mpc30x.c
View file @ 19df0d11
...@@ -34,7 +34,7 @@ static const int irq_tab_mpc30x[] __initdata = { ...@@ -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)];
......
arch/mips/pci/fixup-ocelot-c.c
View file @ 19df0d11
...@@ -19,7 +19,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-ocelot3.c
View file @ 19df0d11
...@@ -23,7 +23,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev) ...@@ -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;
......
arch/mips/pci/fixup-pnx8550.c
View file @ 19df0d11
...@@ -45,7 +45,7 @@ void __init pcibios_fixup(void) ...@@ -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];
} }
......
arch/mips/pci/fixup-rbtx4927.c
View file @ 19df0d11
...@@ -119,7 +119,7 @@ int pci_get_irq(struct pci_dev *dev, int 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;
......
arch/mips/pci/fixup-sni.c
View file @ 19df0d11
...@@ -120,7 +120,7 @@ static inline int is_rm300_revd(void) ...@@ -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:
......
arch/mips/pci/fixup-tb0219.c
View file @ 19df0d11
...@@ -23,7 +23,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-tb0226.c
View file @ 19df0d11
...@@ -23,7 +23,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-tb0287.c
View file @ 19df0d11
...@@ -22,7 +22,7 @@ ...@@ -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;
......
arch/mips/pci/fixup-tx4938.c
View file @ 19df0d11
...@@ -69,7 +69,7 @@ int pci_get_irq(struct pci_dev *dev, int pin) ...@@ -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;
......
arch/mips/pci/fixup-vr4133.c
View file @ 19df0d11
...@@ -169,7 +169,7 @@ void i8259_init(void) ...@@ -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;
......
arch/mips/pci/fixup-wrppmc.c
View file @ 19df0d11
...@@ -25,7 +25,7 @@ static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata = { ...@@ -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];
} }
......
arch/mips/pci/fixup-yosemite.c
View file @ 19df0d11
...@@ -26,7 +26,7 @@ ...@@ -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;
......
arch/mips/pci/pci-bcm1480.c
View file @ 19df0d11
...@@ -74,8 +74,9 @@ static inline void WRITECFG32(u32 addr, u32 data) ...@@ -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;
} }
......
arch/mips/pci/pci-ddb5477.c
View file @ 19df0d11
...@@ -131,7 +131,7 @@ static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = { ...@@ -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;
......
arch/mips/pci/pci-ip27.c
View file @ 19df0d11
...@@ -134,7 +134,7 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid) ...@@ -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];
......
arch/mips/pci/pci-lasat.c
View file @ 19df0d11
...@@ -64,7 +64,7 @@ arch_initcall(lasat_pci_setup); ...@@ -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:
......
arch/mips/pci/pci-sb1250.c
View file @ 19df0d11
...@@ -84,7 +84,7 @@ static inline void WRITECFG32(u32 addr, u32 data) ...@@ -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;
} }
......
include/asm-mips/pci.h
View file @ 19df0d11
...@@ -56,7 +56,7 @@ extern void register_pci_controller(struct pci_controller *hose); ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7