Skip to content

Commit

Permalink
rt2x00pci: Use PCI MSIs whenever possible
Browse files Browse the repository at this point in the history
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Jakub Kicinski authored and John W. Linville committed May 22, 2013
1 parent e9e4330 commit 9483f40
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/net/wireless/rt2x00/rt2x00pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -150,6 +152,9 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
exit_free_device:
ieee80211_free_hw(hw);

exit_disable_msi:
pci_disable_msi(pci_dev);

exit_release_regions:
pci_release_regions(pci_dev);

Expand All @@ -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.
*/
Expand Down

0 comments on commit 9483f40

Please sign in to comment.