korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

r8152: correct some messages

Browse Source 
- Replace pr_warn_ratelimited() with net_ratelimit() and netdev_warn().
 - Adjust the algnment of some messages.
 - Remove the peroid.
 - Fix some messages don't have terminating newline.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hayes Wang 2014-01-07 11:18:22 +08:00 committed by David S. Miller
parent ecca6a968f
commit 4a8deae2f4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/usb/r8152.c
View File

@ -966,10 +966,12 @@ static void read_bulk_callback(struct urb *urb)
case -ENOENT: case -ENOENT:
return; /* the urb is in unlink state */ return; /* the urb is in unlink state */
case -ETIME: case -ETIME:
pr_warn_ratelimited("may be reset is needed?..\n"); if (net_ratelimit())
netdev_warn(netdev, "maybe reset is needed?\n");
break; break;
default: default:
pr_warn_ratelimited("Rx status %d\n", status); if (net_ratelimit())
netdev_warn(netdev, "Rx status %d\n", status);
break; break;
} }
@ -1002,7 +1004,8 @@ static void write_bulk_callback(struct urb *urb)
stats = rtl8152_get_stats(tp->netdev); stats = rtl8152_get_stats(tp->netdev);
if (status) { if (status) {
pr_warn_ratelimited("Tx status %d\n", status); if (net_ratelimit())
netdev_warn(tp->netdev, "Tx status %d\n", status);
stats->tx_errors += agg->skb_num; stats->tx_errors += agg->skb_num;
} else { } else {
stats->tx_packets += agg->skb_num; stats->tx_packets += agg->skb_num;
@ -1079,7 +1082,7 @@ resubmit:
netif_device_detach(tp->netdev); netif_device_detach(tp->netdev);
else if (res) else if (res)
netif_err(tp, intr, tp->netdev, netif_err(tp, intr, tp->netdev,
"can't resubmit intr, status %d\n", res); "can't resubmit intr, status %d\n", res);
} }
static inline void *rx_agg_align(void *data) static inline void *rx_agg_align(void *data)
@ -1490,7 +1493,7 @@ static void rtl8152_tx_timeout(struct net_device *netdev)
struct r8152 *tp = netdev_priv(netdev); struct r8152 *tp = netdev_priv(netdev);
int i; int i;
netif_warn(tp, tx_err, netdev, "Tx timeout.\n"); netif_warn(tp, tx_err, netdev, "Tx timeout\n");
for (i = 0; i < RTL8152_MAX_TX; i++) for (i = 0; i < RTL8152_MAX_TX; i++)
usb_unlink_urb(tp->tx_info[i].urb); usb_unlink_urb(tp->tx_info[i].urb);
} }
@ -2284,8 +2287,8 @@ static int rtl8152_open(struct net_device *netdev)
if (res) { if (res) {
if (res == -ENODEV) if (res == -ENODEV)
netif_device_detach(tp->netdev); netif_device_detach(tp->netdev);
netif_warn(tp, ifup, netdev, netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n",
"intr_urb submit failed: %d\n", res); res);
return res; return res;
} }
@ -2754,7 +2757,7 @@ static int rtl8152_probe(struct usb_interface *intf,
netdev = alloc_etherdev(sizeof(struct r8152)); netdev = alloc_etherdev(sizeof(struct r8152));
if (!netdev) { if (!netdev) {
dev_err(&intf->dev, "Out of memory"); dev_err(&intf->dev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
@ -2800,11 +2803,11 @@ static int rtl8152_probe(struct usb_interface *intf,
ret = register_netdev(netdev); ret = register_netdev(netdev);
if (ret != 0) { if (ret != 0) {
netif_err(tp, probe, netdev, "couldn't register the device"); netif_err(tp, probe, netdev, "couldn't register the device\n");
goto out1; goto out1;
} }
netif_info(tp, probe, netdev, "%s", DRIVER_VERSION); netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION);
return 0; return 0;