diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-05-07 10:52:22 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-05-07 10:52:22 -0400 |
| commit | 96803199b774e0bdc5910d63be5839c4460bd856 (patch) | |
| tree | 04a3820ff3314e1dd4583b5e32addf815abb1425 | |
| parent | 8c9bb608e8ac6fef829a629aa46a5238fad272a4 (diff) | |
PCI/MSI: Drop pci_msi_off() calls from quirks
The PCI core now disables MSI and MSI-X for all devices during enumeration
regardless of CONFIG_PCI_MSI. Remove device-specific code to disable
MSI/MSI-X.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/quirks.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c6dc1dfd25d5..00b106fc0b69 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -1600,7 +1600,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_a | |||
| 1600 | 1600 | ||
| 1601 | static void quirk_pcie_mch(struct pci_dev *pdev) | 1601 | static void quirk_pcie_mch(struct pci_dev *pdev) |
| 1602 | { | 1602 | { |
| 1603 | pci_msi_off(pdev); | ||
| 1604 | pdev->no_msi = 1; | 1603 | pdev->no_msi = 1; |
| 1605 | } | 1604 | } |
| 1606 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, quirk_pcie_mch); | 1605 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, quirk_pcie_mch); |
| @@ -1614,7 +1613,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quir | |||
| 1614 | */ | 1613 | */ |
| 1615 | static void quirk_pcie_pxh(struct pci_dev *dev) | 1614 | static void quirk_pcie_pxh(struct pci_dev *dev) |
| 1616 | { | 1615 | { |
| 1617 | pci_msi_off(dev); | ||
| 1618 | dev->no_msi = 1; | 1616 | dev->no_msi = 1; |
| 1619 | dev_warn(&dev->dev, "PXH quirk detected; SHPC device MSI disabled\n"); | 1617 | dev_warn(&dev->dev, "PXH quirk detected; SHPC device MSI disabled\n"); |
| 1620 | } | 1618 | } |
