Commit 3930115e authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Bjorn Helgaas
Browse files

irqchip: armada-370-xp: Remove arch_msi_check_device() 



Move MSI checks from arch_msi_check_device() to arch_setup_msi_irqs().
This makes the code more compact and allows removing
arch_msi_check_device() from generic MSI code.

Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
CC: Thomas Gleixner <tglx@linutronix.de>
parent 6b2fd7ef

drivers/irqchip/irq-armada-370-xp.c

+4 −10
Original line number Diff line number Diff line
@@ -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 =

CRA Git | Maintained and supported by SUSTech CRA and CCSE