Message ID | 1439372036-15303-2-git-send-email-l.stach@pengutronix.de |
---|---|
State | Changes Requested |
Headers | show |
On Wed, Aug 12, 2015 at 3:03 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Looks fine to me. Reviewed-by: Pratyush Anand <pratyush.anand@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index f66be868ad21..685a83c459c6 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -121,9 +121,12 @@ void __weak arch_teardown_msi_irq(unsigned int irq) int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) { + struct msi_controller *chip = pci_msi_controller(dev); struct msi_desc *entry; int ret; + if (chip && chip->setup_irqs) + return chip->setup_irqs(chip, dev, nvec, type); /* * If an architecture wants to support multiple MSI, it needs to * override arch_setup_msi_irqs() diff --git a/include/linux/msi.h b/include/linux/msi.h index 8ac4a68ffae2..50fefeb30236 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -114,6 +114,8 @@ struct msi_controller { int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev, struct msi_desc *desc); + int (*setup_irqs)(struct msi_controller *chip, struct pci_dev *dev, + int nvec, int type); void (*teardown_irq)(struct msi_controller *chip, unsigned int irq); };
Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/pci/msi.c | 3 +++ include/linux/msi.h | 2 ++ 2 files changed, 5 insertions(+)