mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
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: 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
This commit is contained in:
parent
03f56e42d0
commit
f833869427
2 changed files with 2 additions and 4 deletions
|
@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev)
|
||||||
/* Release MSI interrupts */
|
/* Release MSI interrupts */
|
||||||
list_for_each_entry(msi, &pdev->msi_list, list) {
|
list_for_each_entry(msi, &pdev->msi_list, list) {
|
||||||
if (msi->msi_attrib.is_msix)
|
if (msi->msi_attrib.is_msix)
|
||||||
default_msix_mask_irq(msi, 1);
|
__msix_mask_irq(msi, 1);
|
||||||
else
|
else
|
||||||
default_msi_mask_irq(msi, 1, 1);
|
__msi_mask_irq(msi, 1, 1);
|
||||||
irq_set_msi_desc(msi->irq, NULL);
|
irq_set_msi_desc(msi->irq, NULL);
|
||||||
irq_free_desc(msi->irq);
|
irq_free_desc(msi->irq);
|
||||||
msi->msg.address_lo = 0;
|
msi->msg.address_lo = 0;
|
||||||
|
|
|
@ -64,8 +64,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev);
|
||||||
|
|
||||||
void default_teardown_msi_irqs(struct pci_dev *dev);
|
void default_teardown_msi_irqs(struct pci_dev *dev);
|
||||||
void default_restore_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 msi_chip {
|
||||||
struct module *owner;
|
struct module *owner;
|
||||||
|
|
Loading…
Reference in a new issue