diff options
author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2015-08-03 23:04:06 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-20 13:02:50 -0400 |
commit | 2291ec09025f85c11fbd0e9877c4306a8aa6e7e9 (patch) | |
tree | 030d83fb82d9d2f79187fa877e19491247524a26 /drivers/pci/msi.c | |
parent | b5e5e8a13e19ee17e6ffbe2c3d344182b7be20f6 (diff) |
PCI/MSI: Remove unused pcibios_msi_controller() hook
The pcibios_msi_controller() hook was only implemented by ARM, and it sets
pci_bus->msi now, so it doesn't need this hook anymore.
Remove the unused pcibios_msi_controller() hook.
[bhelgaas: changelog, split into separate patch]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r-- | drivers/pci/msi.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index f66be868ad21..0d20142c1ba0 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -77,24 +77,9 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) | |||
77 | 77 | ||
78 | /* Arch hooks */ | 78 | /* Arch hooks */ |
79 | 79 | ||
80 | struct msi_controller * __weak pcibios_msi_controller(struct pci_dev *dev) | ||
81 | { | ||
82 | return NULL; | ||
83 | } | ||
84 | |||
85 | static struct msi_controller *pci_msi_controller(struct pci_dev *dev) | ||
86 | { | ||
87 | struct msi_controller *msi_ctrl = dev->bus->msi; | ||
88 | |||
89 | if (msi_ctrl) | ||
90 | return msi_ctrl; | ||
91 | |||
92 | return pcibios_msi_controller(dev); | ||
93 | } | ||
94 | |||
95 | int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | 80 | int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) |
96 | { | 81 | { |
97 | struct msi_controller *chip = pci_msi_controller(dev); | 82 | struct msi_controller *chip = dev->bus->msi; |
98 | int err; | 83 | int err; |
99 | 84 | ||
100 | if (!chip || !chip->setup_irq) | 85 | if (!chip || !chip->setup_irq) |