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/catc.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/catc.c')
-rw-r--r-- | drivers/net/usb/catc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 22c17bbacb69..92ff9c83d9f2 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
@@ -456,7 +456,7 @@ static void catc_tx_timeout(struct net_device *netdev) | |||
456 | { | 456 | { |
457 | struct catc *catc = netdev_priv(netdev); | 457 | struct catc *catc = netdev_priv(netdev); |
458 | 458 | ||
459 | warn("Transmit timed out."); | 459 | dev_warn(&netdev->dev, "Transmit timed out.\n"); |
460 | usb_unlink_urb(catc->tx_urb); | 460 | usb_unlink_urb(catc->tx_urb); |
461 | } | 461 | } |
462 | 462 | ||
@@ -847,7 +847,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
847 | dbg("64k Memory\n"); | 847 | dbg("64k Memory\n"); |
848 | break; | 848 | break; |
849 | default: | 849 | default: |
850 | warn("Couldn't detect memory size, assuming 32k"); | 850 | dev_warn(&intf->dev, |
851 | "Couldn't detect memory size, assuming 32k\n"); | ||
851 | case 0x87654321: | 852 | case 0x87654321: |
852 | catc_set_reg(catc, TxBufCount, 4); | 853 | catc_set_reg(catc, TxBufCount, 4); |
853 | catc_set_reg(catc, RxBufCount, 16); | 854 | catc_set_reg(catc, RxBufCount, 16); |