diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-11 01:31:59 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-11 01:32:33 -0400 |
| commit | 616575c2d2460a9b7868f41901f3b0f6e1451f31 (patch) | |
| tree | 2d7ca35cf294681732f20cfd23a70fe8caa9a2c4 /drivers/input | |
| parent | 3b7e09fad9582df27fd72edd018a9c59d085f896 (diff) | |
Input: ALPS - switch to using input_mt_report_finger_count
Instead of open-coded reporting number of fingers on the touchpad
let's use input_mt_report_finger_count() helper.
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/alps.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index ecd93894c806..4a1347e91bdc 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -553,10 +553,7 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse) | |||
| 553 | 553 | ||
| 554 | alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2); | 554 | alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2); |
| 555 | 555 | ||
| 556 | input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); | 556 | input_mt_report_finger_count(dev, fingers); |
| 557 | input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2); | ||
| 558 | input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3); | ||
| 559 | input_report_key(dev, BTN_TOOL_QUADTAP, fingers == 4); | ||
| 560 | 557 | ||
| 561 | input_report_key(dev, BTN_LEFT, left); | 558 | input_report_key(dev, BTN_LEFT, left); |
| 562 | input_report_key(dev, BTN_RIGHT, right); | 559 | input_report_key(dev, BTN_RIGHT, right); |
| @@ -685,10 +682,7 @@ static void alps_process_packet_v4(struct psmouse *psmouse) | |||
| 685 | 682 | ||
| 686 | alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2); | 683 | alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2); |
| 687 | 684 | ||
| 688 | input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); | 685 | input_mt_report_finger_count(dev, fingers); |
| 689 | input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2); | ||
| 690 | input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3); | ||
| 691 | input_report_key(dev, BTN_TOOL_QUADTAP, fingers == 4); | ||
| 692 | 686 | ||
| 693 | input_report_key(dev, BTN_LEFT, left); | 687 | input_report_key(dev, BTN_LEFT, left); |
| 694 | input_report_key(dev, BTN_RIGHT, right); | 688 | input_report_key(dev, BTN_RIGHT, right); |