e1000: use netif_<level> instead of netdev_<level>

This patch restores the ability to set msglvl through ethtool.
The issue was introduced by:
commit 675ad47375c76a7c3be4ace9554d92cd55518ced

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index d5ff029aa7b2..f4d0922ec65b 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -346,7 +346,7 @@ static int e1000_set_tso(struct net_device *netdev, u32 data)
 
         netdev->features &= ~NETIF_F_TSO6;
 
-        e_info("TSO is %s\n", data ? "Enabled" : "Disabled");
+        e_info(probe, "TSO is %s\n", data ? "Enabled" : "Disabled");
         adapter->tso_force = true;
         return 0;
 }
@@ -714,9 +714,9 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, int reg,
                 writel(write & test[i], address);
                 read = readl(address);
                 if (read != (write & test[i] & mask)) {
-                        e_info("pattern test reg %04X failed: "
-                               "got 0x%08X expected 0x%08X\n",
-                               reg, read, (write & test[i] & mask));
+                        e_err(drv, "pattern test reg %04X failed: "
+                              "got 0x%08X expected 0x%08X\n",
+                              reg, read, (write & test[i] & mask));
                         *data = reg;
                         return true;
                 }
@@ -734,7 +734,7 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, int reg,
         writel(write & mask, address);
         read = readl(address);
         if ((read & mask) != (write & mask)) {
-                e_err("set/check reg %04X test failed: "
+                e_err(drv, "set/check reg %04X test failed: "
                       "got 0x%08X expected 0x%08X\n",
                       reg, (read & mask), (write & mask));
                 *data = reg;
@@ -779,7 +779,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         ew32(STATUS, toggle);
         after = er32(STATUS) & toggle;
         if (value != after) {
-                e_err("failed STATUS register test got: "
+                e_err(drv, "failed STATUS register test got: "
                       "0x%08X expected: 0x%08X\n", after, value);
                 *data = 1;
                 return 1;
@@ -894,7 +894,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                 *data = 1;
                 return -1;
         }
-        e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
+        e_info(hw, "testing %s interrupt\n", (shared_int ?
+               "shared" : "unshared"));
 
         /* Disable all the interrupts */
         ew32(IMC, 0xFFFFFFFF);
@@ -1561,7 +1562,7 @@ static void e1000_diag_test(struct net_device *netdev,
                 u8 forced_speed_duplex = hw->forced_speed_duplex;
                 u8 autoneg = hw->autoneg;
 
-                e_info("offline testing starting\n");
+                e_info(hw, "offline testing starting\n");
 
                 /* Link test performed before hardware reset so autoneg doesn't
                  * interfere with test result */
@@ -1601,7 +1602,7 @@ static void e1000_diag_test(struct net_device *netdev,
                 if (if_running)
                         dev_open(netdev);
         } else {
-                e_info("online testing starting\n");
+                e_info(hw, "online testing starting\n");
                 /* Online tests */
                 if (e1000_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1694,8 +1695,8 @@ static void e1000_get_wol(struct net_device *netdev,
                 wol->supported &= ~WAKE_UCAST;
 
                 if (adapter->wol & E1000_WUFC_EX)
-                        e_err("Interface does not support "
-                        "directed (unicast) frame wake-up packets\n");
+                        e_err(drv, "Interface does not support directed "
+                              "(unicast) frame wake-up packets\n");
                 break;
         default:
                 break;
@@ -1726,8 +1727,8 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         switch (hw->device_id) {
         case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
                 if (wol->wolopts & WAKE_UCAST) {
-                        e_err("Interface does not support "
-                              "directed (unicast) frame wake-up packets\n");
+                        e_err(drv, "Interface does not support directed "
+                              "(unicast) frame wake-up packets\n");
                         return -EOPNOTSUPP;
                 }
                 break;