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:09 -0400 |
commit | 3b6004f3b5a8b4506fa8dee29667aed44913a990 (patch) | |
tree | 0f54fd20c8646c7e58a634cddfb5af03730fe9d3 /drivers/usb/misc/uss720.c | |
parent | 4dc8994806a812044e48514af60d4b4e0315f237 (diff) |
USB: remove warn() macro from usb 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().
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/uss720.c')
-rw-r--r-- | drivers/usb/misc/uss720.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index f1255b0a182d..594f3e4e8c2e 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c | |||
@@ -228,11 +228,12 @@ static int get_1284_register(struct parport *pp, unsigned char reg, unsigned cha | |||
228 | ret = rq->urb->status; | 228 | ret = rq->urb->status; |
229 | *val = priv->reg[(reg >= 9) ? 0 : regindex[reg]]; | 229 | *val = priv->reg[(reg >= 9) ? 0 : regindex[reg]]; |
230 | if (ret) | 230 | if (ret) |
231 | warn("get_1284_register: usb error %d", ret); | 231 | printk(KERN_WARNING "get_1284_register: " |
232 | "usb error %d\n", ret); | ||
232 | kref_put(&rq->ref_count, destroy_async); | 233 | kref_put(&rq->ref_count, destroy_async); |
233 | return ret; | 234 | return ret; |
234 | } | 235 | } |
235 | warn("get_1284_register timeout"); | 236 | printk(KERN_WARNING "get_1284_register timeout\n"); |
236 | kill_all_async_requests_priv(priv); | 237 | kill_all_async_requests_priv(priv); |
237 | return -EIO; | 238 | return -EIO; |
238 | } | 239 | } |
@@ -716,7 +717,7 @@ static int uss720_probe(struct usb_interface *intf, | |||
716 | spin_lock_init(&priv->asynclock); | 717 | spin_lock_init(&priv->asynclock); |
717 | INIT_LIST_HEAD(&priv->asynclist); | 718 | INIT_LIST_HEAD(&priv->asynclist); |
718 | if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) { | 719 | if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) { |
719 | warn("could not register parport"); | 720 | printk(KERN_WARNING "uss720: could not register parport\n"); |
720 | goto probe_abort; | 721 | goto probe_abort; |
721 | } | 722 | } |
722 | 723 | ||