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 /drivers/pci/pci.c | |
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 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 39012831867e..11f24912523c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1468,6 +1468,17 @@ void __weak pcibios_release_device(struct pci_dev *dev) {} | |||
1468 | */ | 1468 | */ |
1469 | void __weak pcibios_disable_device (struct pci_dev *dev) {} | 1469 | void __weak pcibios_disable_device (struct pci_dev *dev) {} |
1470 | 1470 | ||
1471 | /** | ||
1472 | * pcibios_penalize_isa_irq - penalize an ISA IRQ | ||
1473 | * @irq: ISA IRQ to penalize | ||
1474 | * @active: IRQ active or not | ||
1475 | * | ||
1476 | * Permits the platform to provide architecture-specific functionality when | ||
1477 | * penalizing ISA IRQs. This is the default implementation. Architecture | ||
1478 | * implementations can override this. | ||
1479 | */ | ||
1480 | void __weak pcibios_penalize_isa_irq(int irq, int active) {} | ||
1481 | |||
1471 | static void do_pci_disable_device(struct pci_dev *dev) | 1482 | static void do_pci_disable_device(struct pci_dev *dev) |
1472 | { | 1483 | { |
1473 | u16 pci_command; | 1484 | u16 pci_command; |