aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2014-05-05 23:29:52 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-05-27 18:23:58 -0400
commita43ae58c848cfbadaba81c8d63202b4487f922a0 (patch)
tree142ac300293f2771444b91b6f077a0bfea622058 /arch/parisc
parent78916b00f0096059c872f537306b1a464c84fb30 (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/parisc')
-rw-r--r--arch/parisc/include/asm/pci.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 465154076d23..20df2b04fc09 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -215,11 +215,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
215} 215}
216#endif 216#endif
217 217
218static inline void pcibios_penalize_isa_irq(int irq, int active)
219{
220 /* We don't need to penalize isa irq's */
221}
222
223static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 218static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
224{ 219{
225 return channel ? 15 : 14; 220 return channel ? 15 : 14;