diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-10 10:30:21 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-22 11:26:06 -0400 |
commit | d5341942d784134f2997b3ff82cd63cf71d1f932 (patch) | |
tree | 355ad81a15d031bbfe7dd94ee6696d8889c926d0 /arch/arm/mach-ixp23xx | |
parent | 05d3ac267a9d10af6ca370afe21802333aad1d5c (diff) |
PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
Aside of the usual motivation for constification, this function has a
history of being abused a hook for interrupt and other fixups so I turned
this function const ages ago in the MIPS code but it should be done
treewide.
Due to function pointer passing in varous places a few other functions
had to be constified as well.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
To: Anton Vorontsov <avorontsov@mvista.com>
To: Chris Metcalf <cmetcalf@tilera.com>
To: Colin Cross <ccross@android.com>
Acked-by: "David S. Miller" <davem@davemloft.net>
To: Eric Miao <eric.y.miao@gmail.com>
To: Erik Gilling <konkers@android.com>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
To: "H. Peter Anvin" <hpa@zytor.com>
To: Imre Kaloz <kaloz@openwrt.org>
To: Ingo Molnar <mingo@redhat.com>
To: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Krzysztof Halasa <khc@pm.waw.pl>
To: Lennert Buytenhek <kernel@wantstofly.org>
To: Matt Turner <mattst88@gmail.com>
To: Nicolas Pitre <nico@fluxnic.net>
To: Olof Johansson <olof@lixom.net>
Acked-by: Paul Mundt <lethal@linux-sh.org>
To: Richard Henderson <rth@twiddle.net>
To: Russell King <linux@arm.linux.org.uk>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-pci@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/arm/mach-ixp23xx')
-rw-r--r-- | arch/arm/mach-ixp23xx/ixdp2351.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/roadrunner.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index 8dcba17c81e7..ec028e35f401 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.c | |||
@@ -168,7 +168,7 @@ void __init ixdp2351_init_irq(void) | |||
168 | */ | 168 | */ |
169 | #define DEVPIN(dev, pin) ((pin) | ((dev) << 3)) | 169 | #define DEVPIN(dev, pin) ((pin) | ((dev) << 3)) |
170 | 170 | ||
171 | static int __init ixdp2351_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 171 | static int __init ixdp2351_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
172 | { | 172 | { |
173 | u8 bus = dev->bus->number; | 173 | u8 bus = dev->bus->number; |
174 | u32 devpin = DEVPIN(PCI_SLOT(dev->devfn), pin); | 174 | u32 devpin = DEVPIN(PCI_SLOT(dev->devfn), pin); |
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c index 8fe0c6273262..844551d2368b 100644 --- a/arch/arm/mach-ixp23xx/roadrunner.c +++ b/arch/arm/mach-ixp23xx/roadrunner.c | |||
@@ -56,7 +56,8 @@ | |||
56 | #define INTC_PIN IXP23XX_GPIO_PIN_11 | 56 | #define INTC_PIN IXP23XX_GPIO_PIN_11 |
57 | #define INTD_PIN IXP23XX_GPIO_PIN_12 | 57 | #define INTD_PIN IXP23XX_GPIO_PIN_12 |
58 | 58 | ||
59 | static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) | 59 | static int __init roadrunner_map_irq(const struct pci_dev *dev, u8 idsel, |
60 | u8 pin) | ||
60 | { | 61 | { |
61 | static int pci_card_slot_irq[] = {INTB, INTC, INTD, INTA}; | 62 | static int pci_card_slot_irq[] = {INTB, INTC, INTD, INTA}; |
62 | static int pmc_card_slot_irq[] = {INTA, INTB, INTC, INTD}; | 63 | static int pmc_card_slot_irq[] = {INTA, INTB, INTC, INTD}; |