diff options
author | Daniel Kurtz <djkurtz@chromium.org> | 2011-07-07 01:42:52 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-07 02:01:13 -0400 |
commit | bea9f0ff263e1c2031d76afc21c22ad773f0b163 (patch) | |
tree | f7eb86ab363a47201c2f9ad17024159580e548b1 | |
parent | a9f0b79edfda3750d254ba5b192795e2554c361d (diff) |
Input: synaptics - rename set_slot to be more descriptive
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/mouse/synaptics.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 363aedf8131d..c5c91bc2cce8 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
@@ -485,7 +485,8 @@ static int synaptics_parse_hw_state(const unsigned char buf[], | |||
485 | return 0; | 485 | return 0; |
486 | } | 486 | } |
487 | 487 | ||
488 | static void set_slot(struct input_dev *dev, int slot, bool active, int x, int y) | 488 | static void synaptics_report_semi_mt_slot(struct input_dev *dev, int slot, |
489 | bool active, int x, int y) | ||
489 | { | 490 | { |
490 | input_mt_slot(dev, slot); | 491 | input_mt_slot(dev, slot); |
491 | input_mt_report_slot_state(dev, MT_TOOL_FINGER, active); | 492 | input_mt_report_slot_state(dev, MT_TOOL_FINGER, active); |
@@ -502,14 +503,16 @@ static void synaptics_report_semi_mt_data(struct input_dev *dev, | |||
502 | int num_fingers) | 503 | int num_fingers) |
503 | { | 504 | { |
504 | if (num_fingers >= 2) { | 505 | if (num_fingers >= 2) { |
505 | set_slot(dev, 0, true, min(a->x, b->x), min(a->y, b->y)); | 506 | synaptics_report_semi_mt_slot(dev, 0, true, min(a->x, b->x), |
506 | set_slot(dev, 1, true, max(a->x, b->x), max(a->y, b->y)); | 507 | min(a->y, b->y)); |
508 | synaptics_report_semi_mt_slot(dev, 1, true, max(a->x, b->x), | ||
509 | max(a->y, b->y)); | ||
507 | } else if (num_fingers == 1) { | 510 | } else if (num_fingers == 1) { |
508 | set_slot(dev, 0, true, a->x, a->y); | 511 | synaptics_report_semi_mt_slot(dev, 0, true, a->x, a->y); |
509 | set_slot(dev, 1, false, 0, 0); | 512 | synaptics_report_semi_mt_slot(dev, 1, false, 0, 0); |
510 | } else { | 513 | } else { |
511 | set_slot(dev, 0, false, 0, 0); | 514 | synaptics_report_semi_mt_slot(dev, 0, false, 0, 0); |
512 | set_slot(dev, 1, false, 0, 0); | 515 | synaptics_report_semi_mt_slot(dev, 1, false, 0, 0); |
513 | } | 516 | } |
514 | } | 517 | } |
515 | 518 | ||