diff options
author | Hanjun Guo <hanjun.guo@linaro.org> | 2014-05-05 23:29:52 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 18:23:58 -0400 |
commit | a43ae58c848cfbadaba81c8d63202b4487f922a0 (patch) | |
tree | 142ac300293f2771444b91b6f077a0bfea622058 /arch/mn10300 | |
parent | 78916b00f0096059c872f537306b1a464c84fb30 (diff) |
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/mn10300')
-rw-r--r-- | arch/mn10300/include/asm/pci.h | 1 | ||||
-rw-r--r-- | arch/mn10300/unit-asb2305/pci-irq.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 166323824683..5f70af25c7d0 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -48,7 +48,6 @@ extern void unit_pci_init(void); | |||
48 | #define PCIBIOS_MIN_MEM 0xB8000000 | 48 | #define PCIBIOS_MIN_MEM 0xB8000000 |
49 | 49 | ||
50 | void pcibios_set_master(struct pci_dev *dev); | 50 | void pcibios_set_master(struct pci_dev *dev); |
51 | void pcibios_penalize_isa_irq(int irq); | ||
52 | 51 | ||
53 | /* Dynamic DMA mapping stuff. | 52 | /* Dynamic DMA mapping stuff. |
54 | * i386 has everything mapped statically. | 53 | * i386 has everything mapped statically. |
diff --git a/arch/mn10300/unit-asb2305/pci-irq.c b/arch/mn10300/unit-asb2305/pci-irq.c index 77439da04671..fcb28ceb824d 100644 --- a/arch/mn10300/unit-asb2305/pci-irq.c +++ b/arch/mn10300/unit-asb2305/pci-irq.c | |||
@@ -40,10 +40,6 @@ void __init pcibios_fixup_irqs(void) | |||
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | void __init pcibios_penalize_isa_irq(int irq) | ||
44 | { | ||
45 | } | ||
46 | |||
47 | void pcibios_enable_irq(struct pci_dev *dev) | 43 | void pcibios_enable_irq(struct pci_dev *dev) |
48 | { | 44 | { |
49 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); | 45 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); |