aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-14 12:37:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:08 -0400
commit4dc8994806a812044e48514af60d4b4e0315f237 (patch)
treee54fb492393827103fc13db5163e18ce01b68290 /drivers/net/irda
parentaa82661baf8a48379355ffa8bf162b07cf487600 (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/irda')
-rw-r--r--drivers/net/irda/stir4200.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 051963782749..148ce2803b00 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -506,7 +506,7 @@ static int change_speed(struct stir_cb *stir, unsigned speed)
506 goto found; 506 goto found;
507 } 507 }
508 508
509 warn("%s: invalid speed %d", stir->netdev->name, speed); 509 dev_warn(&stir->netdev->dev, "invalid speed %d\n", speed);
510 return -EINVAL; 510 return -EINVAL;
511 511
512 found: 512 found:
@@ -598,8 +598,8 @@ static int fifo_txwait(struct stir_cb *stir, int space)
598 err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, 598 err = read_reg(stir, REG_FIFOCTL, stir->fifo_status,
599 FIFO_REGS_SIZE); 599 FIFO_REGS_SIZE);
600 if (unlikely(err != FIFO_REGS_SIZE)) { 600 if (unlikely(err != FIFO_REGS_SIZE)) {
601 warn("%s: FIFO register read error: %d", 601 dev_warn(&stir->netdev->dev,
602 stir->netdev->name, err); 602 "FIFO register read error: %d\n", err);
603 603
604 return err; 604 return err;
605 } 605 }
@@ -836,8 +836,8 @@ static void stir_rcv_irq(struct urb *urb)
836 836
837 /* in case of error, the kernel thread will restart us */ 837 /* in case of error, the kernel thread will restart us */
838 if (err) { 838 if (err) {
839 warn("%s: usb receive submit error: %d", 839 dev_warn(&stir->netdev->dev, "usb receive submit error: %d\n",
840 stir->netdev->name, err); 840 err);
841 stir->receiving = 0; 841 stir->receiving = 0;
842 wake_up_process(stir->thread); 842 wake_up_process(stir->thread);
843 } 843 }