|
@@ -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
|
|
|
|
- "trackpoint.c: failed to create sysfs attributes, error: %d\n",
|
|
|
|
- error);
|
|
|
|
|
|
+ psmouse_err(psmouse,
|
|
|
|
+ "failed to create sysfs attributes, error: %d\n",
|
|
|
|
+ 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",
|
|
|
|
- firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f);
|
|
|
|
|
|
+ psmouse_info(psmouse,
|
|
|
|
+ "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n",
|
|
|
|
+ firmware_id,
|
|
|
|
+ (button_info & 0xf0) >> 4, button_info & 0x0f);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|