summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Keller2014-09-03 10:12:59 +0200
committerJeff Kirsher2014-09-18 13:34:55 +0200
commit5d31b48a42be3a592e4c22303041d12cd4d88c0a (patch)
tree8c0a267c1eb1e4504acb567781a4b4e91e4a444b
parentixgbe: use e_dev_warn instead of e_err for displaying warning (diff)
downloadkernel-qcow2-linux-5d31b48a42be3a592e4c22303041d12cd4d88c0a.tar.gz
kernel-qcow2-linux-5d31b48a42be3a592e4c22303041d12cd4d88c0a.tar.xz
kernel-qcow2-linux-5d31b48a42be3a592e4c22303041d12cd4d88c0a.zip
ixgbe: use e_dev_warn instead of netif_printk
Again, we should not be directly using netif_printk, as we have our own error print routines that we generate. In addition, instead of using an early return we can just use the else block of this one line if statement. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index 969b9799b476..0ec22d8ef059 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -1130,13 +1130,11 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
adapter->num_q_vectors = 1;
err = pci_enable_msi(adapter->pdev);
- if (err) {
- netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
- "Unable to allocate MSI interrupt, falling back to legacy. Error: %d\n",
- err);
- return;
- }
- adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
+ if (err)
+ e_dev_warn("Failed to allocate MSI interrupt, falling back to legacy. Error: %d\n",
+ err);
+ else
+ adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
}
/**