+ free-electron's guys.
On Sun, Sep 07, 2014 at 08:57:54PM +0200, Alexander Gordeev wrote:
> Moving MSI checks from arch_msi_check_device() function to
> arch_setup_msi_irqs() function makes code more compact and
> allows removing unnecessary hook arch_msi_check_device()
> from generic MSI code.
>
> Cc: Thomas Gleixner <t...@linutronix.de>
> Cc: Jason Cooper <ja...@lakedaemon.net>
> Cc: linux-...@vger.kernel.org
> Signed-off-by: Alexander Gordeev <agord...@redhat.com>
> ---
> drivers/irqchip/irq-armada-370-xp.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/irqchip/irq-armada-370-xp.c
> b/drivers/irqchip/irq-armada-370-xp.c
> index 574aba0..df60eab 100644
> --- a/drivers/irqchip/irq-armada-370-xp.c
> +++ b/drivers/irqchip/irq-armada-370-xp.c
> @@ -136,6 +136,10 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip
> *chip,
> struct msi_msg msg;
> int virq, hwirq;
>
> + /* We support MSI, but not MSI-X */
> + if (desc->msi_attrib.is_msix)
> + return -EINVAL;
> +
> hwirq = armada_370_xp_alloc_msi();
> if (hwirq < 0)
> return hwirq;
> @@ -166,15 +170,6 @@ static void armada_370_xp_teardown_msi_irq(struct
> msi_chip *chip,
> armada_370_xp_free_msi(hwirq);
> }
>
> -static int armada_370_xp_check_msi_device(struct msi_chip *chip, struct
> pci_dev *dev,
> - int nvec, int type)
> -{
> - /* We support MSI, but not MSI-X */
> - if (type == PCI_CAP_ID_MSI)
> - return 0;
> - return -EINVAL;
> -}
> -
> static struct irq_chip armada_370_xp_msi_irq_chip = {
> .name = "armada_370_xp_msi_irq",
> .irq_enable = unmask_msi_irq,
> @@ -213,7 +208,6 @@ static int armada_370_xp_msi_init(struct device_node
> *node,
>
> msi_chip->setup_irq = armada_370_xp_setup_msi_irq;
> msi_chip->teardown_irq = armada_370_xp_teardown_msi_irq;
> - msi_chip->check_device = armada_370_xp_check_msi_device;
> msi_chip->of_node = node;
>
> armada_370_xp_msi_domain =
> --
> 1.9.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
