Skip to content

Commit

Permalink
s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
Browse files Browse the repository at this point in the history
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: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
CC: linux-s390@vger.kernel.org
  • Loading branch information
Yijing Wang authored and Bjorn Helgaas committed Nov 11, 2014
1 parent 03f56e4 commit f833869
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/s390/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/msi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f833869

Please sign in to comment.