Commit 60b86755 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

usbnet: Convert dev(dbg|err|warn|info) macros to netdev_<level> 



These macros are too similar to the dev_<level> equivalents
but take a usbnet * argument.  Convert them to the recently
introduced netdev_<level> macros and remove the old macros.

The old macros had "\n" appended to the format string.
Add the "\n" to the converted uses.

Some existing uses of the dev<foo> macros in cdc_eem.c
probably mistakenly had trailing "\n".  No "\n" added there.

Fix net1080 this/other log message inversion.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82456b03

drivers/net/usb/asix.c

+53 −44
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, 
	void *buf;

	int err = -ENOMEM;



	devdbg(dev,"asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",

	netdev_dbg(dev->net, "asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",

		   cmd, value, index, size);



	buf = kmalloc(size, GFP_KERNEL);
@@ -217,7 +217,7 @@ static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, 
	void *buf = NULL;

	int err = -ENOMEM;



	devdbg(dev,"asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",

	netdev_dbg(dev->net, "asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",

		   cmd, value, index, size);



	if (data) {
@@ -264,15 +264,15 @@ asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index, 
	int status;

	struct urb *urb;



	devdbg(dev,"asix_write_cmd_async() cmd=0x%02x value=0x%04x index=0x%04x size=%d",

	netdev_dbg(dev->net, "asix_write_cmd_async() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",

		   cmd, value, index, size);

	if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {

		deverr(dev, "Error allocating URB in write_cmd_async!");

		netdev_err(dev->net, "Error allocating URB in write_cmd_async!\n");

		return;

	}



	if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {

		deverr(dev, "Failed to allocate memory for control request");

		netdev_err(dev->net, "Failed to allocate memory for control request\n");

		usb_free_urb(urb);

		return;

	}
@@ -289,7 +289,7 @@ asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index, 
			     asix_async_cmd_callback, req);



	if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {

		deverr(dev, "Error submitting the control message: status=%d",

		netdev_err(dev->net, "Error submitting the control message: status=%d\n",

			   status);

		kfree(req);

		usb_free_urb(urb);
@@ -314,7 +314,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
	while (skb->len > 0) {

		if ((short)(header & 0x0000ffff) !=

		    ~((short)((header & 0xffff0000) >> 16))) {

			deverr(dev,"asix_rx_fixup() Bad Header Length");

			netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");

		}

		/* get the packet length */

		size = (u16) (header & 0x0000ffff);
@@ -322,7 +322,8 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
		if ((skb->len) - ((size + 1) & 0xfffe) == 0)

			return 2;

		if (size > ETH_FRAME_LEN) {

			deverr(dev,"asix_rx_fixup() Bad RX Length %d", size);

			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",

				   size);

			return 0;

		}

		ax_skb = skb_clone(skb, GFP_ATOMIC);
@@ -348,7 +349,8 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
	}



	if (skb->len < 0) {

		deverr(dev,"asix_rx_fixup() Bad SKB Length %d", skb->len);

		netdev_err(dev->net, "asix_rx_fixup() Bad SKB Length %d\n",

			   skb->len);

		return 0;

	}

	return 1;
@@ -409,7 +411,7 @@ static void asix_status(struct usbnet *dev, struct urb *urb) 
			usbnet_defer_kevent (dev, EVENT_LINK_RESET );

		} else

			netif_carrier_off(dev->net);

		devdbg(dev, "Link Status is: %d", link);

		netdev_dbg(dev->net, "Link Status is: %d\n", link);

	}

}
@@ -418,7 +420,7 @@ static inline int asix_set_sw_mii(struct usbnet *dev) 
	int ret;

	ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);

	if (ret < 0)

		deverr(dev, "Failed to enable software MII access");

		netdev_err(dev->net, "Failed to enable software MII access\n");

	return ret;

}
@@ -427,7 +429,7 @@ static inline int asix_set_hw_mii(struct usbnet *dev) 
	int ret;

	ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);

	if (ret < 0)

		deverr(dev, "Failed to enable hardware MII access");

		netdev_err(dev->net, "Failed to enable hardware MII access\n");

	return ret;

}
@@ -436,13 +438,14 @@ static inline int asix_get_phy_addr(struct usbnet *dev) 
	u8 buf[2];

	int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);



	devdbg(dev, "asix_get_phy_addr()");

	netdev_dbg(dev->net, "asix_get_phy_addr()\n");



	if (ret < 0) {

		deverr(dev, "Error reading PHYID register: %02x", ret);

		netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);

		goto out;

	}

	devdbg(dev, "asix_get_phy_addr() returning 0x%04x", *((__le16 *)buf));

	netdev_dbg(dev->net, "asix_get_phy_addr() returning 0x%04x\n",

		   *((__le16 *)buf));

	ret = buf[1];



out:
@@ -455,7 +458,7 @@ static int asix_sw_reset(struct usbnet *dev, u8 flags) 


        ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);

	if (ret < 0)

		deverr(dev,"Failed to send software reset: %02x", ret);

		netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);



	return ret;

}
@@ -466,7 +469,7 @@ static u16 asix_read_rx_ctl(struct usbnet *dev) 
	int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);



	if (ret < 0) {

		deverr(dev, "Error reading RX_CTL register: %02x", ret);

		netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);

		goto out;

	}

	ret = le16_to_cpu(v);
@@ -478,10 +481,10 @@ static int asix_write_rx_ctl(struct usbnet *dev, u16 mode) 
{

	int ret;



	devdbg(dev,"asix_write_rx_ctl() - mode = 0x%04x", mode);

	netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);

	if (ret < 0)

		deverr(dev, "Failed to write RX_CTL mode to 0x%04x: %02x",

		netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",

			   mode, ret);



	return ret;
@@ -493,7 +496,8 @@ static u16 asix_read_medium_status(struct usbnet *dev) 
	int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);



	if (ret < 0) {

		deverr(dev, "Error reading Medium Status register: %02x", ret);

		netdev_err(dev->net, "Error reading Medium Status register: %02x\n",

			   ret);

		goto out;

	}

	ret = le16_to_cpu(v);
@@ -505,10 +509,10 @@ static int asix_write_medium_mode(struct usbnet *dev, u16 mode) 
{

	int ret;



	devdbg(dev,"asix_write_medium_mode() - mode = 0x%04x", mode);

	netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);

	if (ret < 0)

		deverr(dev, "Failed to write Medium Mode mode to 0x%04x: %02x",

		netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",

			   mode, ret);



	return ret;
@@ -518,10 +522,10 @@ static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep) 
{

	int ret;



	devdbg(dev,"asix_write_gpio() - value = 0x%04x", value);

	netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);

	if (ret < 0)

		deverr(dev, "Failed to write GPIO value 0x%04x: %02x",

		netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",

			   value, ret);



	if (sleep)
@@ -588,7 +592,8 @@ static int asix_mdio_read(struct net_device *netdev, int phy_id, int loc) 
	asix_set_hw_mii(dev);

	mutex_unlock(&dev->phy_mutex);



	devdbg(dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x", phy_id, loc, le16_to_cpu(res));

	netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",

		   phy_id, loc, le16_to_cpu(res));



	return le16_to_cpu(res);

}
@@ -599,7 +604,8 @@ asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val) 
	struct usbnet *dev = netdev_priv(netdev);

	__le16 res = cpu_to_le16(val);



	devdbg(dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x", phy_id, loc, val);

	netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",

		   phy_id, loc, val);

	mutex_lock(&dev->phy_mutex);

	asix_set_sw_mii(dev);

	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
@@ -800,7 +806,8 @@ static int ax88172_link_reset(struct usbnet *dev) 
	if (ecmd.duplex != DUPLEX_FULL)

		mode |= ~AX88172_MEDIUM_FD;



	devdbg(dev, "ax88172_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);

	netdev_dbg(dev->net, "ax88172_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",

		   ecmd.speed, ecmd.duplex, mode);



	asix_write_medium_mode(dev, mode);
@@ -902,7 +909,8 @@ static int ax88772_link_reset(struct usbnet *dev) 
	if (ecmd.duplex != DUPLEX_FULL)

		mode &= ~AX_MEDIUM_FD;



	devdbg(dev, "ax88772_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);

	netdev_dbg(dev->net, "ax88772_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",

		   ecmd.speed, ecmd.duplex, mode);



	asix_write_medium_mode(dev, mode);
@@ -1059,10 +1067,10 @@ static int marvell_phy_init(struct usbnet *dev) 
	struct asix_data *data = (struct asix_data *)&dev->data;

	u16 reg;



	devdbg(dev,"marvell_phy_init()");

	netdev_dbg(dev->net, "marvell_phy_init()\n");



	reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);

	devdbg(dev,"MII_MARVELL_STATUS = 0x%04x", reg);

	netdev_dbg(dev->net, "MII_MARVELL_STATUS = 0x%04x\n", reg);



	asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,

			MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
@@ -1070,7 +1078,7 @@ static int marvell_phy_init(struct usbnet *dev) 
	if (data->ledmode) {

		reg = asix_mdio_read(dev->net, dev->mii.phy_id,

			MII_MARVELL_LED_CTRL);

		devdbg(dev,"MII_MARVELL_LED_CTRL (1) = 0x%04x", reg);

		netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (1) = 0x%04x\n", reg);



		reg &= 0xf8ff;

		reg |= (1 + 0x0100);
@@ -1079,7 +1087,7 @@ static int marvell_phy_init(struct usbnet *dev) 


		reg = asix_mdio_read(dev->net, dev->mii.phy_id,

			MII_MARVELL_LED_CTRL);

		devdbg(dev,"MII_MARVELL_LED_CTRL (2) = 0x%04x", reg);

		netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (2) = 0x%04x\n", reg);

		reg &= 0xfc0f;

	}
@@ -1090,7 +1098,7 @@ static int marvell_led_status(struct usbnet *dev, u16 speed) 
{

	u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);



	devdbg(dev, "marvell_led_status() read 0x%04x", reg);

	netdev_dbg(dev->net, "marvell_led_status() read 0x%04x\n", reg);



	/* Clear out the center LED bits - 0x03F0 */

	reg &= 0xfc0f;
@@ -1106,7 +1114,7 @@ static int marvell_led_status(struct usbnet *dev, u16 speed) 
			reg |= 0x02f0;

	}



	devdbg(dev, "marvell_led_status() writing 0x%04x", reg);

	netdev_dbg(dev->net, "marvell_led_status() writing 0x%04x\n", reg);

	asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);



	return 0;
@@ -1118,7 +1126,7 @@ static int ax88178_link_reset(struct usbnet *dev) 
	struct ethtool_cmd ecmd;

	struct asix_data *data = (struct asix_data *)&dev->data;



	devdbg(dev,"ax88178_link_reset()");

	netdev_dbg(dev->net, "ax88178_link_reset()\n");



	mii_check_media(&dev->mii, 1, 1);

	mii_ethtool_gset(&dev->mii, &ecmd);
@@ -1138,7 +1146,8 @@ static int ax88178_link_reset(struct usbnet *dev) 
	else

		mode &= ~AX_MEDIUM_FD;



	devdbg(dev, "ax88178_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);

	netdev_dbg(dev->net, "ax88178_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",

		   ecmd.speed, ecmd.duplex, mode);



	asix_write_medium_mode(dev, mode);
@@ -1188,7 +1197,7 @@ static int ax88178_change_mtu(struct net_device *net, int new_mtu) 
	struct usbnet *dev = netdev_priv(net);

	int ll_mtu = new_mtu + net->hard_header_len + 4;



	devdbg(dev, "ax88178_change_mtu() new_mtu=%d", new_mtu);

	netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);



	if (new_mtu <= 0 || ll_mtu > 16384)

		return -EINVAL;

drivers/net/usb/cdc_eem.c

+6 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb) 
		usb_free_urb(urb);

fail:

		dev_kfree_skb(skb);

		devwarn(dev, "link cmd failure\n");

		netdev_warn(dev->net, "link cmd failure\n");

		return;

	}

}
@@ -212,7 +212,8 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
			 * b15:		1 (EEM command)

			 */

			if (header & BIT(14)) {

				devdbg(dev, "reserved command %04x\n", header);

				netdev_dbg(dev->net, "reserved command %04x\n",

					   header);

				continue;

			}
@@ -255,7 +256,8 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
			case 1:		/* Echo response */

			case 5:		/* Tickle */

			default:	/* reserved */

				devwarn(dev, "unexpected link command %d\n",

				netdev_warn(dev->net,

					    "unexpected link command %d\n",

					    bmEEMCmd);

				continue;

			}

drivers/net/usb/cdc_ether.c

+9 −9
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); 
static void dumpspeed(struct usbnet *dev, __le32 *speeds)

{

	if (netif_msg_timer(dev))

		devinfo(dev, "link speeds: %u kbps up, %u kbps down",

		netdev_info(dev->net, "link speeds: %u kbps up, %u kbps down\n",

			    __le32_to_cpu(speeds[0]) / 1000,

			    __le32_to_cpu(speeds[1]) / 1000);

}
@@ -362,7 +362,7 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
	switch (event->bNotificationType) {

	case USB_CDC_NOTIFY_NETWORK_CONNECTION:

		if (netif_msg_timer(dev))

			devdbg(dev, "CDC: carrier %s",

			netdev_dbg(dev->net, "CDC: carrier %s\n",

				   event->wValue ? "on" : "off");

		if (event->wValue)

			netif_carrier_on(dev->net);
@@ -371,7 +371,7 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
		break;

	case USB_CDC_NOTIFY_SPEED_CHANGE:	/* tx/rx rates */

		if (netif_msg_timer(dev))

			devdbg(dev, "CDC: speed change (len %d)",

			netdev_dbg(dev->net, "CDC: speed change (len %d)\n",

				   urb->actual_length);

		if (urb->actual_length != (sizeof *event + 8))

			set_bit(EVENT_STS_SPLIT, &dev->flags);
@@ -382,7 +382,7 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
	 * but there are no standard formats for the response data.

	 */

	default:

		deverr(dev, "CDC: unexpected notification %02x!",

		netdev_err(dev->net, "CDC: unexpected notification %02x!\n",

			   event->bNotificationType);

		break;

	}

drivers/net/usb/dm9601.c

+25 −24
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data) 
	void *buf;

	int err = -ENOMEM;



	devdbg(dev, "dm_read() reg=0x%02x length=%d", reg, length);

	netdev_dbg(dev->net, "dm_read() reg=0x%02x length=%d\n", reg, length);



	buf = kmalloc(length, GFP_KERNEL);

	if (!buf)
@@ -89,7 +89,7 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data) 
	void *buf = NULL;

	int err = -ENOMEM;



	devdbg(dev, "dm_write() reg=0x%02x, length=%d", reg, length);

	netdev_dbg(dev->net, "dm_write() reg=0x%02x, length=%d\n", reg, length);



	if (data) {

		buf = kmalloc(length, GFP_KERNEL);
@@ -112,7 +112,8 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data) 


static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)

{

	devdbg(dev, "dm_write_reg() reg=0x%02x, value=0x%02x", reg, value);

	netdev_dbg(dev->net, "dm_write_reg() reg=0x%02x, value=0x%02x\n",

		   reg, value);

	return usb_control_msg(dev->udev,

			       usb_sndctrlpipe(dev->udev, 0),

			       DM_WRITE_REG,
@@ -142,13 +143,13 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value, 


	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		deverr(dev, "Error allocating URB in dm_write_async_helper!");

		netdev_err(dev->net, "Error allocating URB in dm_write_async_helper!\n");

		return;

	}



	req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);

	if (!req) {

		deverr(dev, "Failed to allocate memory for control request");

		netdev_err(dev->net, "Failed to allocate memory for control request\n");

		usb_free_urb(urb);

		return;

	}
@@ -166,7 +167,7 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value, 


	status = usb_submit_urb(urb, GFP_ATOMIC);

	if (status < 0) {

		deverr(dev, "Error submitting the control message: status=%d",

		netdev_err(dev->net, "Error submitting the control message: status=%d\n",

			   status);

		kfree(req);

		usb_free_urb(urb);
@@ -175,14 +176,14 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value, 


static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)

{

	devdbg(dev, "dm_write_async() reg=0x%02x length=%d", reg, length);

	netdev_dbg(dev->net, "dm_write_async() reg=0x%02x length=%d\n", reg, length);



	dm_write_async_helper(dev, reg, 0, length, data);

}



static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)

{

	devdbg(dev, "dm_write_reg_async() reg=0x%02x value=0x%02x",

	netdev_dbg(dev->net, "dm_write_reg_async() reg=0x%02x value=0x%02x\n",

		   reg, value);



	dm_write_async_helper(dev, reg, value, 0, NULL);
@@ -211,7 +212,7 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *valu 
	}



	if (i == DM_TIMEOUT) {

		deverr(dev, "%s read timed out!", phy ? "phy" : "eeprom");

		netdev_err(dev->net, "%s read timed out!\n", phy ? "phy" : "eeprom");

		ret = -EIO;

		goto out;

	}
@@ -219,7 +220,7 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *valu 
	dm_write_reg(dev, DM_SHARED_CTRL, 0x0);

	ret = dm_read(dev, DM_SHARED_DATA, 2, value);



	devdbg(dev, "read shared %d 0x%02x returned 0x%04x, %d",

	netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",

		   phy, reg, *value, ret);



 out:
@@ -254,7 +255,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu 
	}



	if (i == DM_TIMEOUT) {

		deverr(dev, "%s write timed out!", phy ? "phy" : "eeprom");

		netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");

		ret = -EIO;

		goto out;

	}
@@ -304,14 +305,14 @@ static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc) 
	__le16 res;



	if (phy_id) {

		devdbg(dev, "Only internal phy supported");

		netdev_dbg(dev->net, "Only internal phy supported\n");

		return 0;

	}



	dm_read_shared_word(dev, 1, loc, &res);



	devdbg(dev,

	       "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x",

	netdev_dbg(dev->net,

		   "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",

		   phy_id, loc, le16_to_cpu(res));



	return le16_to_cpu(res);
@@ -324,11 +325,11 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc, 
	__le16 res = cpu_to_le16(val);



	if (phy_id) {

		devdbg(dev, "Only internal phy supported");

		netdev_dbg(dev->net, "Only internal phy supported\n");

		return;

	}



	devdbg(dev,"dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x",

	netdev_dbg(dev->net, "dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",

		   phy_id, loc, val);



	dm_write_shared_word(dev, 1, loc, res);
@@ -592,7 +593,7 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb) 
		}

		else

			netif_carrier_off(dev->net);

		devdbg(dev, "Link Status is: %d", link);

		netdev_dbg(dev->net, "Link Status is: %d\n", link);

	}

}
@@ -603,7 +604,7 @@ static int dm9601_link_reset(struct usbnet *dev) 
	mii_check_media(&dev->mii, 1, 1);

	mii_ethtool_gset(&dev->mii, &ecmd);



	devdbg(dev, "link_reset() speed: %d duplex: %d",

	netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",

		   ecmd.speed, ecmd.duplex);



	return 0;

drivers/net/usb/int51x1.c

+8 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
	int len;



	if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {

		deverr(dev, "unexpected tiny rx frame");

		netdev_err(dev->net, "unexpected tiny rx frame\n");

		return 0;

	}
@@ -138,25 +138,25 @@ static void int51x1_set_multicast(struct net_device *netdev) 
	if (netdev->flags & IFF_PROMISC) {

		/* do not expect to see traffic of other PLCs */

		filter |= PACKET_TYPE_PROMISCUOUS;

		devinfo(dev, "promiscuous mode enabled");

		netdev_info(dev->net, "promiscuous mode enabled\n");

	} else if (!netdev_mc_empty(netdev) ||

		  (netdev->flags & IFF_ALLMULTI)) {

		filter |= PACKET_TYPE_ALL_MULTICAST;

		devdbg(dev, "receive all multicast enabled");

		netdev_dbg(dev->net, "receive all multicast enabled\n");

	} else {

		/* ~PROMISCUOUS, ~MULTICAST */

		devdbg(dev, "receive own packets only");

		netdev_dbg(dev->net, "receive own packets only\n");

	}



	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		devwarn(dev, "Error allocating URB");

		netdev_warn(dev->net, "Error allocating URB\n");

		return;

	}



	req = kmalloc(sizeof(*req), GFP_ATOMIC);

	if (!req) {

		devwarn(dev, "Error allocating control msg");

		netdev_warn(dev->net, "Error allocating control msg\n");

		goto out;

	}
@@ -173,7 +173,8 @@ static void int51x1_set_multicast(struct net_device *netdev) 


	status = usb_submit_urb(urb, GFP_ATOMIC);

	if (status < 0) {

		devwarn(dev, "Error submitting control msg, sts=%d", status);

		netdev_warn(dev->net, "Error submitting control msg, sts=%d\n",

			    status);

		goto out1;

	}

	return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE