diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-14 12:37:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:08 -0400 |
commit | 4dc8994806a812044e48514af60d4b4e0315f237 (patch) | |
tree | e54fb492393827103fc13db5163e18ce01b68290 /drivers/net/usb/kaweth.c | |
parent | aa82661baf8a48379355ffa8bf162b07cf487600 (diff) |
USB: remove warn() macro from usb net drivers
USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible. In the
few places that will not work out, use a basic printk().
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/usb/kaweth.c')
-rw-r--r-- | drivers/net/usb/kaweth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index d6829db51b45..4f7a0106781e 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -832,7 +832,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
832 | 832 | ||
833 | if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC))) | 833 | if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC))) |
834 | { | 834 | { |
835 | warn("kaweth failed tx_urb %d", res); | 835 | dev_warn(&net->dev, "kaweth failed tx_urb %d\n", res); |
836 | skip: | 836 | skip: |
837 | kaweth->stats.tx_errors++; | 837 | kaweth->stats.tx_errors++; |
838 | 838 | ||
@@ -924,7 +924,7 @@ static void kaweth_tx_timeout(struct net_device *net) | |||
924 | { | 924 | { |
925 | struct kaweth_device *kaweth = netdev_priv(net); | 925 | struct kaweth_device *kaweth = netdev_priv(net); |
926 | 926 | ||
927 | warn("%s: Tx timed out. Resetting.", net->name); | 927 | dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name); |
928 | kaweth->stats.tx_errors++; | 928 | kaweth->stats.tx_errors++; |
929 | net->trans_start = jiffies; | 929 | net->trans_start = jiffies; |
930 | 930 | ||
@@ -1209,7 +1209,7 @@ static void kaweth_disconnect(struct usb_interface *intf) | |||
1209 | 1209 | ||
1210 | usb_set_intfdata(intf, NULL); | 1210 | usb_set_intfdata(intf, NULL); |
1211 | if (!kaweth) { | 1211 | if (!kaweth) { |
1212 | warn("unregistering non-existant device"); | 1212 | dev_warn(&intf->dev, "unregistering non-existant device\n"); |
1213 | return; | 1213 | return; |
1214 | } | 1214 | } |
1215 | netdev = kaweth->net; | 1215 | netdev = kaweth->net; |
@@ -1269,7 +1269,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length) | |||
1269 | 1269 | ||
1270 | if (!wait_event_timeout(awd.wqh, awd.done, timeout)) { | 1270 | if (!wait_event_timeout(awd.wqh, awd.done, timeout)) { |
1271 | // timeout | 1271 | // timeout |
1272 | warn("usb_control/bulk_msg: timeout"); | 1272 | dev_warn(&urb->dev->dev, "usb_control/bulk_msg: timeout\n"); |
1273 | usb_kill_urb(urb); // remove urb safely | 1273 | usb_kill_urb(urb); // remove urb safely |
1274 | status = -ETIMEDOUT; | 1274 | status = -ETIMEDOUT; |
1275 | } | 1275 | } |