diff options
Diffstat (limited to 'drivers/staging/unisys/visorinput')
| -rw-r--r-- | drivers/staging/unisys/visorinput/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorinput/ultrainputreport.h | 45 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorinput/visorinput.c | 10 |
3 files changed, 33 insertions, 24 deletions
diff --git a/drivers/staging/unisys/visorinput/Kconfig b/drivers/staging/unisys/visorinput/Kconfig index 3476d419d..655cd6243 100644 --- a/drivers/staging/unisys/visorinput/Kconfig +++ b/drivers/staging/unisys/visorinput/Kconfig @@ -4,7 +4,7 @@ config UNISYS_VISORINPUT tristate "Unisys visorinput driver" - depends on UNISYSSPAR && UNISYS_VISORBUS && FB + depends on UNISYSSPAR && UNISYS_VISORBUS && FB && INPUT ---help--- The Unisys s-Par visorinput driver provides a virtualized system console (keyboard and mouse) that is accessible through the diff --git a/drivers/staging/unisys/visorinput/ultrainputreport.h b/drivers/staging/unisys/visorinput/ultrainputreport.h index 3e6a52f4b..1bc3d2064 100644 --- a/drivers/staging/unisys/visorinput/ultrainputreport.h +++ b/drivers/staging/unisys/visorinput/ultrainputreport.h @@ -29,33 +29,40 @@ enum ultra_inputaction { inputaction_mouse_button_up = 3, /* arg1: 1=left,2=center,3=right */ inputaction_mouse_button_click = 4, /* arg1: 1=left,2=center,3=right */ inputaction_mouse_button_dclick = 5, /* arg1: 1=left,2=center, - 3=right */ + * 3=right + */ inputaction_wheel_rotate_away = 6, /* arg1: wheel rotation away from - user */ + * user + */ inputaction_wheel_rotate_toward = 7, /* arg1: wheel rotation toward - user */ + * user + */ inputaction_set_max_xy = 8, /* set screen maxXY; arg1=x, arg2=y */ inputaction_key_down = 64, /* arg1: scancode, as follows: - If arg1 <= 0xff, it's a 1-byte - scancode and arg1 is that scancode. - If arg1 > 0xff, it's a 2-byte - scanecode, with the 1st byte in the - low 8 bits, and the 2nd byte in the - high 8 bits. E.g., the right ALT key - would appear as x'38e0'. */ + * If arg1 <= 0xff, it's a 1-byte + * scancode and arg1 is that scancode. + * If arg1 > 0xff, it's a 2-byte + * scanecode, with the 1st byte in the + * low 8 bits, and the 2nd byte in the + * high 8 bits. E.g., the right ALT key + * would appear as x'38e0'. + */ inputaction_key_up = 65, /* arg1: scancode (in same format as - inputaction_keyDown) */ + * inputaction_keyDown) + */ inputaction_set_locking_key_state = 66, /* arg1: scancode (in same format - as inputaction_keyDown); - MUST refer to one of the - locking keys, like capslock, - numlock, or scrolllock - arg2: 1 iff locking key should be - in the LOCKED position - (e.g., light is ON) */ + * as inputaction_keyDown); + * MUST refer to one of the + * locking keys, like capslock, + * numlock, or scrolllock + * arg2: 1 iff locking key should be + * in the LOCKED position + * (e.g., light is ON) + */ inputaction_key_down_up = 67, /* arg1: scancode (in same format - as inputaction_keyDown) */ + * as inputaction_keyDown) + */ inputaction_last }; diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index 38d4d5b88..13c031611 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -222,8 +222,9 @@ static int visorinput_open(struct input_dev *visorinput_dev) struct visorinput_devdata *devdata = input_get_drvdata(visorinput_dev); if (!devdata) { - pr_err("%s input_get_drvdata(%p) returned NULL\n", - __func__, visorinput_dev); + dev_err(&visorinput_dev->dev, + "%s input_get_drvdata(%p) returned NULL\n", + __func__, visorinput_dev); return -EINVAL; } dev_dbg(&visorinput_dev->dev, "%s opened\n", __func__); @@ -236,8 +237,9 @@ static void visorinput_close(struct input_dev *visorinput_dev) struct visorinput_devdata *devdata = input_get_drvdata(visorinput_dev); if (!devdata) { - pr_err("%s input_get_drvdata(%p) returned NULL\n", - __func__, visorinput_dev); + dev_err(&visorinput_dev->dev, + "%s input_get_drvdata(%p) returned NULL\n", + __func__, visorinput_dev); return; } dev_dbg(&visorinput_dev->dev, "%s closed\n", __func__); |