p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc: Remove MSI-related PCI controller ops from ppc_md 

Remove unneeded ppc_md functions. Patch callsites to use pci_controller_ops
functions exclusively.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Daniel Axtens 2015-04-14 14:28:03 +10:00 committed by Michael Ellerman
parent 14f95acda2
commit 1f88d5860e
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/include/asm/machdep.h
View File

@ -131,12 +131,6 @@ struct machdep_calls {
/* To setup PHBs when using automatic OF platform driver for PCI */
int (*pci_setup_phb)(struct pci_controller *host);
#ifdef CONFIG_PCI_MSI
int (*setup_msi_irqs)(struct pci_dev *dev,
int nvec, int type);
void (*teardown_msi_irqs)(struct pci_dev *dev);
#endif
void (*restart)(char *cmd);
void (*halt)(void);
void (*panic)(char *str);

15
arch/powerpc/kernel/msi.c
View File

@ -17,9 +17,8 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{
struct pci_controller *phb = pci_bus_to_host(dev->bus);
if ((!phb->controller_ops.setup_msi_irqs ||
!phb->controller_ops.teardown_msi_irqs) &&
(!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs)) {
if (!phb->controller_ops.setup_msi_irqs ||
!phb->controller_ops.teardown_msi_irqs) {
pr_debug("msi: Platform doesn't provide MSI callbacks.\n");
return -ENOSYS;
}
@ -28,18 +27,12 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
if (type == PCI_CAP_ID_MSI && nvec > 1)
return 1;
if (phb->controller_ops.setup_msi_irqs)
return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
else
return ppc_md.setup_msi_irqs(dev, nvec, type);
return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
}
void arch_teardown_msi_irqs(struct pci_dev *dev)
{
struct pci_controller *phb = pci_bus_to_host(dev->bus);
if (phb->controller_ops.teardown_msi_irqs)
phb->controller_ops.teardown_msi_irqs(dev);
else
ppc_md.teardown_msi_irqs(dev);
phb->controller_ops.teardown_msi_irqs(dev);
}