aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2007-01-25 03:34:07 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 18:50:06 -0500
commit88187dfa4d8bb565df762f272511d2c91e427e0d (patch)
tree451f53265c52ea50bcb43bb4e5854fe9c3359182 /drivers/net
parent89298c7a41e71ecb1e0c3f793655e9ce09662ce0 (diff)
MSI: Replace pci_msi_quirk with calls to pci_no_msi()
I don't see any reason why we need pci_msi_quirk, quirk code can just call pci_no_msi() instead. Remove the check of pci_msi_quirk in msi_init(). This is safe as all calls to msi_init() are protected by calls to pci_msi_supported(), which checks pci_msi_enable, which is disabled by pci_no_msi(). The pci_disable_msi routines didn't check pci_msi_quirk, only pci_msi_enable, but as far as I can see that was a bug not a feature. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ee7b75b976b5..0420697c4293 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -5954,8 +5954,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
5954 * responding after a while. 5954 * responding after a while.
5955 * 5955 *
5956 * AMD believes this incompatibility is unique to the 5706, and 5956 * AMD believes this incompatibility is unique to the 5706, and
5957 * prefers to locally disable MSI rather than globally disabling it 5957 * prefers to locally disable MSI rather than globally disabling it.
5958 * using pci_msi_quirk.
5959 */ 5958 */
5960 if (CHIP_NUM(bp) == CHIP_NUM_5706 && disable_msi == 0) { 5959 if (CHIP_NUM(bp) == CHIP_NUM_5706 && disable_msi == 0) {
5961 struct pci_dev *amd_8132 = NULL; 5960 struct pci_dev *amd_8132 = NULL;