diff options
Diffstat (limited to 'drivers/usb/atm')
-rw-r--r-- | drivers/usb/atm/cxacru.c | 9 | ||||
-rw-r--r-- | drivers/usb/atm/usbatm.c | 4 | ||||
-rw-r--r-- | drivers/usb/atm/xusbatm.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index e62a770a5d3b..4d3947476f0e 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c @@ -810,9 +810,6 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance, mutex_unlock(&instance->poll_state_serialize); mutex_unlock(&instance->adsl_state_serialize); - printk(KERN_INFO "%s%d: %s %pM\n", atm_dev->type, atm_dev->number, - usbatm_instance->description, atm_dev->esi); - if (start_polling) cxacru_poll_status(&instance->poll_work.work); return 0; @@ -852,15 +849,15 @@ static void cxacru_poll_status(struct work_struct *work) switch (instance->adsl_status) { case 0: - atm_printk(KERN_INFO, usbatm, "ADSL state: running\n"); + atm_info(usbatm, "ADSL state: running\n"); break; case 1: - atm_printk(KERN_INFO, usbatm, "ADSL state: stopped\n"); + atm_info(usbatm, "ADSL state: stopped\n"); break; default: - atm_printk(KERN_INFO, usbatm, "Unknown adsl status %02x\n", instance->adsl_status); + atm_info(usbatm, "Unknown adsl status %02x\n", instance->adsl_status); break; } } diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 56fe30d247da..33ae03ac13a6 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -249,7 +249,7 @@ static void usbatm_complete(struct urb *urb) /* vdbg("%s: urb 0x%p, status %d, actual_length %d", __func__, urb, status, urb->actual_length); */ - /* usually in_interrupt(), but not always */ + /* Can be invoked from task context, protect against interrupts */ spin_lock_irqsave(&channel->lock, flags); /* must add to the back when receiving; doesn't matter when sending */ @@ -1278,7 +1278,7 @@ EXPORT_SYMBOL_GPL(usbatm_usb_disconnect); static int __init usbatm_usb_init(void) { if (sizeof(struct usbatm_control) > sizeof_field(struct sk_buff, cb)) { - printk(KERN_ERR "%s unusable with this kernel!\n", usbatm_driver_name); + pr_err("%s unusable with this kernel!\n", usbatm_driver_name); return -EIO; } diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c index ffc9810070a3..0befbf63d1cc 100644 --- a/drivers/usb/atm/xusbatm.c +++ b/drivers/usb/atm/xusbatm.c @@ -179,7 +179,7 @@ static int __init xusbatm_init(void) num_vendor != num_product || num_vendor != num_rx_endpoint || num_vendor != num_tx_endpoint) { - printk(KERN_WARNING "xusbatm: malformed module parameters\n"); + pr_warn("xusbatm: malformed module parameters\n"); return -EINVAL; } |