renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 20:24:09 +08:00
Code

HID: remove warn() macro from usb hid drivers

Browse Source 
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>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
From: Greg Kroah-Hartman 2008-10-12 00:25:51 +02:00 committed by Jiri Kosina
parent ddbe324919
commit 7d89fe12bd
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hid/usbhid/hid-core.c
View File

@ -213,7 +213,8 @@ static void hid_irq_in(struct urb *urb)
hid_io_error(hid); hid_io_error(hid);
return; return;
default: /* error */ default: /* error */
warn("input irq status %d received", urb->status); dev_warn(&urb->dev->dev, "input irq status %d "
"received\n", urb->status);
} }
status = usb_submit_urb(urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
@ -327,7 +328,8 @@ static void hid_irq_out(struct urb *urb)
case -ENOENT: case -ENOENT:
break; break;
default: /* error */ default: /* error */
warn("output irq status %d received", urb->status); dev_warn(&urb->dev->dev, "output irq status %d "
"received\n", urb->status);
} }
spin_lock_irqsave(&usbhid->outlock, flags); spin_lock_irqsave(&usbhid->outlock, flags);
@ -380,7 +382,8 @@ static void hid_ctrl(struct urb *urb)
case -EPIPE: /* report not available */ case -EPIPE: /* report not available */
break; break;
default: /* error */ default: /* error */
warn("ctrl urb status %d received", urb->status); dev_warn(&urb->dev->dev, "ctrl urb status %d "
"received\n", urb->status);
} }
if (unplug) if (unplug)
@ -418,7 +421,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
if ((head = (usbhid->outhead + 1) & (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid->outtail) { if ((head = (usbhid->outhead + 1) & (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid->outtail) {
spin_unlock_irqrestore(&usbhid->outlock, flags); spin_unlock_irqrestore(&usbhid->outlock, flags);
warn("output queue full"); dev_warn(&hid->dev, "output queue full\n");
return; return;
} }
@ -444,7 +447,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
if ((head = (usbhid->ctrlhead + 1) & (HID_CONTROL_FIFO_SIZE - 1)) == usbhid->ctrltail) { if ((head = (usbhid->ctrlhead + 1) & (HID_CONTROL_FIFO_SIZE - 1)) == usbhid->ctrltail) {
spin_unlock_irqrestore(&usbhid->ctrllock, flags); spin_unlock_irqrestore(&usbhid->ctrllock, flags);
warn("control queue full"); dev_warn(&hid->dev, "control queue full\n");
return; return;
} }
@ -482,7 +485,7 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un
return -1; return -1;
if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) { if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) {
warn("event field not found"); dev_warn(&dev->dev, "event field not found\n");
return -1; return -1;
} }
@ -585,7 +588,7 @@ void usbhid_init_reports(struct hid_device *hid)
} }
if (err) if (err)
warn("timeout initializing reports"); dev_warn(&hid->dev, "timeout initializing reports\n");
} }
/* /*

3
drivers/hid/usbhid/usbkbd.c
View File

@ -161,7 +161,8 @@ static void usb_kbd_led(struct urb *urb)
struct usb_kbd *kbd = urb->context; struct usb_kbd *kbd = urb->context;
if (urb->status) if (urb->status)
warn("led urb status %d received", urb->status); dev_warn(&urb->dev->dev, "led urb status %d received\n",
urb->status);
if (*(kbd->leds) == kbd->newleds) if (*(kbd->leds) == kbd->newleds)
return; return;