diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 02:28:50 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 19:41:36 -0400 |
commit | e9870c4c0aef94580e28be11a1c6246dcabbe528 (patch) | |
tree | 4f06f3afeb9fb84e561e1f624b7ea0585fd0a94c /include/asm-sparc64/pbm.h | |
parent | f1cd8de2c951e206b57fd76aff279cf13ea25815 (diff) |
[SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/pbm.h')
-rw-r--r-- | include/asm-sparc64/pbm.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index 1f4de53dcd03..1d5dcfe133a2 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h | |||
@@ -103,6 +103,9 @@ struct pci_pbm_info { | |||
103 | u32 msi64_len; | 103 | u32 msi64_len; |
104 | void *msi_queues; | 104 | void *msi_queues; |
105 | unsigned long *msi_bitmap; | 105 | unsigned long *msi_bitmap; |
106 | int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev, | ||
107 | struct msi_desc *entry); | ||
108 | void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev); | ||
106 | #endif /* !(CONFIG_PCI_MSI) */ | 109 | #endif /* !(CONFIG_PCI_MSI) */ |
107 | 110 | ||
108 | /* This PBM's streaming buffer. */ | 111 | /* This PBM's streaming buffer. */ |
@@ -128,13 +131,6 @@ struct pci_controller_info { | |||
128 | /* The PCI bus modules controlled by us. */ | 131 | /* The PCI bus modules controlled by us. */ |
129 | struct pci_pbm_info pbm_A; | 132 | struct pci_pbm_info pbm_A; |
130 | struct pci_pbm_info pbm_B; | 133 | struct pci_pbm_info pbm_B; |
131 | |||
132 | /* Operations which are controller specific. */ | ||
133 | #ifdef CONFIG_PCI_MSI | ||
134 | int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev, | ||
135 | struct msi_desc *entry); | ||
136 | void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev); | ||
137 | #endif | ||
138 | }; | 134 | }; |
139 | 135 | ||
140 | #endif /* !(__SPARC64_PBM_H) */ | 136 | #endif /* !(__SPARC64_PBM_H) */ |