]> xenbits.xensource.com Git - people/aperard/linux-chromebook.git/commitdiff
CHROMIUM: Input: cyapa - Remove CYAPA_MAX_TOUCHES define
authorBenson Leung <bleung@chromium.org>
Wed, 24 Oct 2012 22:44:42 +0000 (15:44 -0700)
committerGerrit <chrome-bot@google.com>
Wed, 14 Nov 2012 21:14:06 +0000 (13:14 -0800)
It's only used once in struct cyapa_reg_data, so lets just
hard code it there.

Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chromium-os:21047
TEST=builds clean.

Change-Id: I6d39e70f369b0825238022a38111e2fa42862c5e
Reviewed-on: https://gerrit.chromium.org/gerrit/37745
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Commit-Ready: Benson Leung <bleung@chromium.org>

drivers/input/mouse/cyapa.c

index a9f4c6fcbbd1590b1cce709d8b79ddb7525ab4f3..5c132bd0416b5a6c862afafa87a92030e710aad9 100644 (file)
@@ -206,9 +206,6 @@ struct cyapa_touch {
 /* The touch.id is used as the MT slot id, thus max MT slot is 15 */
 #define CYAPA_MAX_MT_SLOTS  15
 
-/* CYAPA reports up to 5 touches per packet. */
-#define CYAPA_MAX_TOUCHES  5
-
 struct cyapa_reg_data {
        /*
         * bit 0 - 1: device status
@@ -225,7 +222,8 @@ struct cyapa_reg_data {
         * bit 0: left mechanism button state if exists
         */
        u8 finger_btn;
-       struct cyapa_touch touches[CYAPA_MAX_TOUCHES];
+       /* CYAPA reports up to 5 touches per packet. */
+       struct cyapa_touch touches[5];
 } __packed;
 
 /* The main device structure */