Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: trackpoint - use psmouse_fmt() for messages

Browse Source 
Use psmouse_*() macros introduced in commit b5d2170436.

Signed-off-by: JJ Ding <dgdunix@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
JJ Ding 2012-04-10 00:25:01 -07:00 committed by Dmitry Torokhov
parent e3dde4fba9
commit fb16395ee6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/input/mouse/trackpoint.c
View File

@ -304,7 +304,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
return 0; return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
printk(KERN_WARNING "trackpoint.c: failed to get extended button data\n"); psmouse_warn(psmouse, "failed to get extended button data\n");
button_info = 0; button_info = 0;
} }
@ -326,16 +326,18 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);
if (error) { if (error) {
printk(KERN_ERR psmouse_err(psmouse,
"trackpoint.c: failed to create sysfs attributes, error: %d\n", "failed to create sysfs attributes, error: %d\n",
error); error);
kfree(psmouse->private); kfree(psmouse->private);
psmouse->private = NULL; psmouse->private = NULL;
return -1; return -1;
} }
printk(KERN_INFO "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n", psmouse_info(psmouse,
firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f); "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n",
firmware_id,
(button_info & 0xf0) >> 4, button_info & 0x0f);
return 0; return 0;
} }