diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-10 21:27:03 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-10 21:28:16 -0400 |
commit | b5d21704361eefe337a36ebbb57a1d9927132511 (patch) | |
tree | 8ab7f31597a792a37d578d5652fbb573b8f5723c /drivers/input/mouse/logips2pp.c | |
parent | ae927560a7d3055618ccc73a5d057cdd91b63740 (diff) |
Input: psmouse - switch to using dev_*() for messages
This will ensure our reporting is consistent with the rest of the system
and we do not refer to obsolete source file names.
Reviewed-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Reviewed-by: JJ Ding <dgdunix@gmail.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
-rw-r--r-- | drivers/input/mouse/logips2pp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index c9983aee9082..faac2c3bef74 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c | |||
@@ -82,11 +82,11 @@ static psmouse_ret_t ps2pp_process_byte(struct psmouse *psmouse) | |||
82 | packet[0] = packet[2] | 0x08; | 82 | packet[0] = packet[2] | 0x08; |
83 | break; | 83 | break; |
84 | 84 | ||
85 | #ifdef DEBUG | ||
86 | default: | 85 | default: |
87 | printk(KERN_WARNING "psmouse.c: Received PS2++ packet #%x, but don't know how to handle.\n", | 86 | psmouse_dbg(psmouse, |
88 | (packet[1] >> 4) | (packet[0] & 0x30)); | 87 | "Received PS2++ packet #%x, but don't know how to handle.\n", |
89 | #endif | 88 | (packet[1] >> 4) | (packet[0] & 0x30)); |
89 | break; | ||
90 | } | 90 | } |
91 | } else { | 91 | } else { |
92 | /* Standard PS/2 motion data */ | 92 | /* Standard PS/2 motion data */ |
@@ -382,7 +382,7 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties) | |||
382 | } | 382 | } |
383 | 383 | ||
384 | } else { | 384 | } else { |
385 | printk(KERN_WARNING "logips2pp: Detected unknown logitech mouse model %d\n", model); | 385 | psmouse_warn(psmouse, "Detected unknown Logitech mouse model %d\n", model); |
386 | } | 386 | } |
387 | 387 | ||
388 | if (set_properties) { | 388 | if (set_properties) { |
@@ -400,9 +400,9 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties) | |||
400 | error = device_create_file(&psmouse->ps2dev.serio->dev, | 400 | error = device_create_file(&psmouse->ps2dev.serio->dev, |
401 | &psmouse_attr_smartscroll.dattr); | 401 | &psmouse_attr_smartscroll.dattr); |
402 | if (error) { | 402 | if (error) { |
403 | printk(KERN_ERR | 403 | psmouse_err(psmouse, |
404 | "logips2pp.c: failed to create smartscroll " | 404 | "failed to create smartscroll sysfs attribute, error: %d\n", |
405 | "sysfs attribute, error: %d\n", error); | 405 | error); |
406 | return -1; | 406 | return -1; |
407 | } | 407 | } |
408 | } | 408 | } |