diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2014-05-06 11:29:52 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 16:23:58 -0600 |
| commit | a43ae58c848cfbadaba81c8d63202b4487f922a0 (patch) | |
| tree | 142ac300293f2771444b91b6f077a0bfea622058 /arch/frv | |
| parent | 78916b00f0096059c872f537306b1a464c84fb30 (diff) | |
| download | op-kernel-dev-a43ae58c848cfbadaba81c8d63202b4487f922a0.zip op-kernel-dev-a43ae58c848cfbadaba81c8d63202b4487f922a0.tar.gz | |
PCI: Turn pcibios_penalize_isa_irq() into a weak function
pcibios_penalize_isa_irq() is only implemented by x86 now, and legacy ISA
is not used by some architectures. Make pcibios_penalize_isa_irq() a
__weak function to simplify the code. This removes the need for new
platforms to add stub implementations of pcibios_penalize_isa_irq().
[bhelgaas: changelog, comments]
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/include/asm/pci.h | 2 | ||||
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-irq.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index ef03baf..2035a4d 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h @@ -24,8 +24,6 @@ struct pci_dev; extern void pcibios_set_master(struct pci_dev *dev); -extern void pcibios_penalize_isa_irq(int irq); - #ifdef CONFIG_MMU extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle); extern void consistent_free(void *vaddr); diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c index c677b9d..1c35c93 100644 --- a/arch/frv/mb93090-mb00/pci-irq.c +++ b/arch/frv/mb93090-mb00/pci-irq.c @@ -55,10 +55,6 @@ void __init pcibios_fixup_irqs(void) } } -void __init pcibios_penalize_isa_irq(int irq) -{ -} - void pcibios_enable_irq(struct pci_dev *dev) { pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); |
