diff options
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/msi-xlp.c | 10 | ||||
-rw-r--r-- | arch/mips/pci/pci-xlr.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c index afd8405e0188..3249685e03ad 100644 --- a/arch/mips/pci/msi-xlp.c +++ b/arch/mips/pci/msi-xlp.c | |||
@@ -206,14 +206,8 @@ static struct irq_chip xlp_msix_chip = { | |||
206 | .irq_unmask = unmask_msi_irq, | 206 | .irq_unmask = unmask_msi_irq, |
207 | }; | 207 | }; |
208 | 208 | ||
209 | void destroy_irq(unsigned int irq) | ||
210 | { | ||
211 | /* nothing to do yet */ | ||
212 | } | ||
213 | |||
214 | void arch_teardown_msi_irq(unsigned int irq) | 209 | void arch_teardown_msi_irq(unsigned int irq) |
215 | { | 210 | { |
216 | destroy_irq(irq); | ||
217 | } | 211 | } |
218 | 212 | ||
219 | /* | 213 | /* |
@@ -298,10 +292,8 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link, | |||
298 | 292 | ||
299 | xirq = xirq + msivec; /* msi mapped to global irq space */ | 293 | xirq = xirq + msivec; /* msi mapped to global irq space */ |
300 | ret = irq_set_msi_desc(xirq, desc); | 294 | ret = irq_set_msi_desc(xirq, desc); |
301 | if (ret < 0) { | 295 | if (ret < 0) |
302 | destroy_irq(xirq); | ||
303 | return ret; | 296 | return ret; |
304 | } | ||
305 | 297 | ||
306 | write_msi_msg(xirq, &msg); | 298 | write_msi_msg(xirq, &msg); |
307 | return 0; | 299 | return 0; |
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c index 4427abbd48b5..0dde80332d3a 100644 --- a/arch/mips/pci/pci-xlr.c +++ b/arch/mips/pci/pci-xlr.c | |||
@@ -214,14 +214,8 @@ static int get_irq_vector(const struct pci_dev *dev) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | #ifdef CONFIG_PCI_MSI | 216 | #ifdef CONFIG_PCI_MSI |
217 | void destroy_irq(unsigned int irq) | ||
218 | { | ||
219 | /* nothing to do yet */ | ||
220 | } | ||
221 | |||
222 | void arch_teardown_msi_irq(unsigned int irq) | 217 | void arch_teardown_msi_irq(unsigned int irq) |
223 | { | 218 | { |
224 | destroy_irq(irq); | ||
225 | } | 219 | } |
226 | 220 | ||
227 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | 221 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) |
@@ -263,10 +257,8 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | |||
263 | MSI_DATA_DELIVERY_FIXED; | 257 | MSI_DATA_DELIVERY_FIXED; |
264 | 258 | ||
265 | ret = irq_set_msi_desc(irq, desc); | 259 | ret = irq_set_msi_desc(irq, desc); |
266 | if (ret < 0) { | 260 | if (ret < 0) |
267 | destroy_irq(irq); | ||
268 | return ret; | 261 | return ret; |
269 | } | ||
270 | 262 | ||
271 | write_msi_msg(irq, &msg); | 263 | write_msi_msg(irq, &msg); |
272 | return 0; | 264 | return 0; |