Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675ad473 authored by Emil Tantilov's avatar Emil Tantilov Committed by David S. Miller
Browse files

e1000: Use netdev_<level>, pr_<level> and dev_<level> 



This patch is an alternative to similar patch provided by Joe Perches.

Substitute DPRINTK macro for e_<level> that uses netdev_<level> and dev_<level>
similar to e1000e.
- Convert printk to pr_<level> where applicable.
- Use common #define pr_fmt for the driver.
- Use dev_<level> for displaying text in parts of the driver where the interface
  name is not assigned (like e1000_param.c).
- Better align test with the new macros.

CC: Joe Perches <joe@perches.com>
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 709b9326

drivers/net/e1000/e1000.h

+20 −17
Original line number Diff line number Diff line
@@ -81,23 +81,6 @@ struct e1000_adapter; 


#include "e1000_hw.h"



#ifdef DBG

#define E1000_DBG(args...) printk(KERN_DEBUG "e1000: " args)

#else

#define E1000_DBG(args...)

#endif



#define E1000_ERR(args...) printk(KERN_ERR "e1000: " args)



#define PFX "e1000: "



#define DPRINTK(nlevel, klevel, fmt, args...)				\

do {									\

	if (NETIF_MSG_##nlevel & adapter->msg_enable)			\

		printk(KERN_##klevel PFX "%s: %s: " fmt,		\

		       adapter->netdev->name, __func__, ##args);	\

} while (0)



#define E1000_MAX_INTR 10



/* TX/RX descriptor defines */
@@ -335,6 +318,25 @@ enum e1000_state_t { 
	__E1000_DOWN

};



#undef pr_fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);

#define e_dbg(format, arg...) \

	netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)

#define e_err(format, arg...) \

	netdev_err(adapter->netdev, format, ## arg)

#define e_info(format, arg...) \

	netdev_info(adapter->netdev, format, ## arg)

#define e_warn(format, arg...) \

	netdev_warn(adapter->netdev, format, ## arg)

#define e_notice(format, arg...) \

	netdev_notice(adapter->netdev, format, ## arg)

#define e_dev_info(format, arg...) \

	dev_info(&adapter->pdev->dev, format, ## arg)

#define e_dev_warn(format, arg...) \

	dev_warn(&adapter->pdev->dev, format, ## arg)



extern char e1000_driver_name[];

extern const char e1000_driver_version[];
@@ -352,5 +354,6 @@ extern bool e1000_has_link(struct e1000_adapter *adapter); 
extern void e1000_power_up_phy(struct e1000_adapter *);

extern void e1000_set_ethtool_ops(struct net_device *netdev);

extern void e1000_check_options(struct e1000_adapter *adapter);

extern char *e1000_get_hw_dev_name(struct e1000_hw *hw);



#endif /* _E1000_H_ */

drivers/net/e1000/e1000_ethtool.c

+15 −16
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int e1000_set_tso(struct net_device *netdev, u32 data) 


	netdev->features &= ~NETIF_F_TSO6;



	DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");

	e_info("TSO is %s\n", data ? "Enabled" : "Disabled");

	adapter->tso_force = true;

	return 0;

}
@@ -714,7 +714,7 @@ 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)) {

			DPRINTK(DRV, ERR, "pattern test reg %04X failed: "

			e_info("pattern test reg %04X failed: "

			       "got 0x%08X expected 0x%08X\n",

			       reg, read, (write & test[i] & mask));

			*data = reg;
@@ -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)) {

		DPRINTK(DRV, ERR, "set/check reg %04X test failed: "

		e_err("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) {

		DPRINTK(DRV, ERR, "failed STATUS register test got: "

		e_err("failed STATUS register test got: "

		      "0x%08X expected: 0x%08X\n", after, value);

		*data = 1;

		return 1;
@@ -894,8 +894,7 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data) 
		*data = 1;

		return -1;

	}

	DPRINTK(HW, INFO, "testing %s interrupt\n",

	        (shared_int ? "shared" : "unshared"));

	e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));



	/* Disable all the interrupts */

	ew32(IMC, 0xFFFFFFFF);
@@ -1564,7 +1563,7 @@ static void e1000_diag_test(struct net_device *netdev, 
		u8 forced_speed_duplex = hw->forced_speed_duplex;

		u8 autoneg = hw->autoneg;



		DPRINTK(HW, INFO, "offline testing starting\n");

		e_info("offline testing starting\n");



		/* Link test performed before hardware reset so autoneg doesn't

		 * interfere with test result */
@@ -1604,7 +1603,7 @@ static void e1000_diag_test(struct net_device *netdev, 
		if (if_running)

			dev_open(netdev);

	} else {

		DPRINTK(HW, INFO, "online testing starting\n");

		e_info("online testing starting\n");

		/* Online tests */

		if (e1000_link_test(adapter, &data[4]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1697,7 +1696,7 @@ static void e1000_get_wol(struct net_device *netdev, 
		wol->supported &= ~WAKE_UCAST;



		if (adapter->wol & E1000_WUFC_EX)

			DPRINTK(DRV, ERR, "Interface does not support "

			e_err("Interface does not support "

		        "directed (unicast) frame wake-up packets\n");

		break;

	default:
@@ -1731,7 +1730,7 @@ 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) {

			DPRINTK(DRV, ERR, "Interface does not support "

			e_err("Interface does not support "

			      "directed (unicast) frame wake-up packets\n");

			return -EOPNOTSUPP;

		}