diff mbox

rt2x00pci: Use PCI MSIs whenever possible

Message ID 1367879330-5718-1-git-send-email-kubakici@wp.pl (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Jakub Kicinski May 6, 2013, 10:28 p.m. UTC 
All PCIe devices must support MSIs, make use of them.

Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00pci.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index dc49e52..76d95de 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -105,11 +105,13 @@  int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
 		goto exit_release_regions;
 	}

+	pci_enable_msi(pci_dev);
+
 	hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
 	if (!hw) {
 		rt2x00_probe_err("Failed to allocate hardware\n");
 		retval = -ENOMEM;
-		goto exit_release_regions;
+		goto exit_disable_msi;
 	}

 	pci_set_drvdata(pci_dev, hw);
@@ -150,6 +152,9 @@  exit_free_reg:
 exit_free_device:
 	ieee80211_free_hw(hw);

+exit_disable_msi:
+	pci_disable_msi(pci_dev);
+
 exit_release_regions:
 	pci_release_regions(pci_dev);

@@ -174,6 +179,8 @@  void rt2x00pci_remove(struct pci_dev *pci_dev)
 	rt2x00pci_free_reg(rt2x00dev);
 	ieee80211_free_hw(hw);

+	pci_disable_msi(pci_dev);
+
 	/*
 	 * Free the PCI device data.
 	 */