Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8338694 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() 



Now only s390/MSI use default_msi_mask_irq() and default_msix_mask_irq(),
replace them with the common MSI mask IRQ functions __msi_mask_irq() and
__msix_mask_irq().  Remove default_msi_mask_irq() and
default_msix_mask_irq().

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
CC: linux-s390@vger.kernel.org
parent 03f56e42

arch/s390/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev) 
	/* Release MSI interrupts */

	list_for_each_entry(msi, &pdev->msi_list, list) {

		if (msi->msi_attrib.is_msix)

			default_msix_mask_irq(msi, 1);

			__msix_mask_irq(msi, 1);

		else

			default_msi_mask_irq(msi, 1, 1);

			__msi_mask_irq(msi, 1, 1);

		irq_set_msi_desc(msi->irq, NULL);

		irq_free_desc(msi->irq);

		msi->msg.address_lo = 0;

include/linux/msi.h

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev); 


void default_teardown_msi_irqs(struct pci_dev *dev);

void default_restore_msi_irqs(struct pci_dev *dev);

#define default_msi_mask_irq  __msi_mask_irq

#define default_msix_mask_irq  __msix_mask_irq



struct msi_chip {

	struct module *owner;