aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2011-01-22 06:32:20 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-16 21:19:03 -0400
commit44ed3c0c47906297924c3fde801dc160f6996f7c (patch)
treef11b2de6fd33842c7aadd8cafdfbd136b56bfed6 /arch/sparc/kernel/pci.c
parentfe41493f749797f516deb84ba07747fb7d8c04c1 (diff)
sparc64: rename virt_irq => irq - II
The generic irq support uses the term 'irq' for the allocated irq number. Fix it so sparc64 use the same term for an irq as the generic irq support does. For a naive reader this is less confusing. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/pci.c')
-rw-r--r--arch/sparc/kernel/pci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 4137579d9adc..bfede51c3afc 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -1001,22 +1001,22 @@ EXPORT_SYMBOL(pci_domain_nr);
1001int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 1001int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
1002{ 1002{
1003 struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; 1003 struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
1004 unsigned int virt_irq; 1004 unsigned int irq;
1005 1005
1006 if (!pbm->setup_msi_irq) 1006 if (!pbm->setup_msi_irq)
1007 return -EINVAL; 1007 return -EINVAL;
1008 1008
1009 return pbm->setup_msi_irq(&virt_irq, pdev, desc); 1009 return pbm->setup_msi_irq(&irq, pdev, desc);
1010} 1010}
1011 1011
1012void arch_teardown_msi_irq(unsigned int virt_irq) 1012void arch_teardown_msi_irq(unsigned int irq)
1013{ 1013{
1014 struct msi_desc *entry = get_irq_msi(virt_irq); 1014 struct msi_desc *entry = get_irq_msi(irq);
1015 struct pci_dev *pdev = entry->dev; 1015 struct pci_dev *pdev = entry->dev;
1016 struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; 1016 struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
1017 1017
1018 if (pbm->teardown_msi_irq) 1018 if (pbm->teardown_msi_irq)
1019 pbm->teardown_msi_irq(virt_irq, pdev); 1019 pbm->teardown_msi_irq(irq, pdev);
1020} 1020}
1021#endif /* !(CONFIG_PCI_MSI) */ 1021#endif /* !(CONFIG_PCI_MSI) */
1022 1022