projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into core/futexes
[cascardo/linux.git]
/
drivers
/
net
/
irda
/
stir4200.c
diff --git
a/drivers/net/irda/stir4200.c
b/drivers/net/irda/stir4200.c
index
0519637
..
3575804
100644
(file)
--- 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)
goto found;
}
goto found;
}
-
warn("%s: invalid speed %d", stir->netdev->name
, speed);
+
dev_warn(&stir->netdev->dev, "invalid speed %d\n"
, speed);
return -EINVAL;
found:
return -EINVAL;
found:
@@
-598,8
+598,8
@@
static int fifo_txwait(struct stir_cb *stir, int space)
err = read_reg(stir, REG_FIFOCTL, stir->fifo_status,
FIFO_REGS_SIZE);
if (unlikely(err != FIFO_REGS_SIZE)) {
err = read_reg(stir, REG_FIFOCTL, stir->fifo_status,
FIFO_REGS_SIZE);
if (unlikely(err != FIFO_REGS_SIZE)) {
- warn("%s: FIFO register read error: %d",
-
stir->netdev->name
, err);
+ dev_warn(&stir->netdev->dev,
+
"FIFO register read error: %d\n"
, err);
return err;
}
return err;
}
@@
-783,8
+783,9
@@
static int stir_transmit_thread(void *arg)
if (unlikely(receive_start(stir))) {
if (net_ratelimit())
if (unlikely(receive_start(stir))) {
if (net_ratelimit())
- info("%s: receive usb submit failed",
- stir->netdev->name);
+ dev_info(&dev->dev,
+ "%s: receive usb submit failed\n",
+ stir->netdev->name);
stir->receiving = 0;
msleep(10);
continue;
stir->receiving = 0;
msleep(10);
continue;
@@
-836,8
+837,8
@@
static void stir_rcv_irq(struct urb *urb)
/* in case of error, the kernel thread will restart us */
if (err) {
/* in case of error, the kernel thread will restart us */
if (err) {
-
warn("%s: usb receive submit error: %d
",
-
stir->netdev->name,
err);
+
dev_warn(&stir->netdev->dev, "usb receive submit error: %d\n
",
+ err);
stir->receiving = 0;
wake_up_process(stir->thread);
}
stir->receiving = 0;
wake_up_process(stir->thread);
}
@@
-1073,7
+1074,8
@@
static int stir_probe(struct usb_interface *intf,
if (ret != 0)
goto err_out2;
if (ret != 0)
goto err_out2;
- info("IrDA: Registered SigmaTel device %s", net->name);
+ dev_info(&intf->dev, "IrDA: Registered SigmaTel device %s\n",
+ net->name);
usb_set_intfdata(intf, stir);
usb_set_intfdata(intf, stir);