]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ixgbe: use e_dev_warn instead of netif_printk
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 3 Sep 2014 08:12:59 +0000 (08:12 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 18 Sep 2014 11:34:55 +0000 (04:34 -0700)
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>
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

index 969b9799b476e2a4a97aa2cd7a6bf2da40dcb93c..0ec22d8ef05942d3bab6ed5b064eaf77084a5929 100644 (file)
@@ -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;
 }
 
 /**