[media] ati_remote: Shrink the ati_remote_tbl even more

Get rid of the unnecessary "type" and "value" fields.

Signed-off-by: George Spelvin <linux@horizon.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 35 insertions, 34 deletions

diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 401a9f4d6198..a41986ca1310 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -279,43 +279,42 @@ struct ati_remote {
 
 /* "Kinds" of messages sent from the hardware to the driver. */
 #define KIND_END        0
-#define KIND_LITERAL    1   /* Simply pass to input system */
+#define KIND_LITERAL    1   /* Simply pass to input system as EV_KEY */
 #define KIND_FILTERED   2   /* Add artificial key-up events, drop keyrepeats */
-#define KIND_ACCEL      3   /* Directional keypad - left, right, up, down.*/
+#define KIND_ACCEL      3   /* Translate to EV_REL mouse-move events */
 
 /* Translation table from hardware messages to input events. */
 static const struct {
         unsigned char kind;
-        unsigned char data;
-        unsigned char type;
-        unsigned short code;
-        signed char value;
+        unsigned char data;     /* Raw key code from remote */
+        unsigned short code;    /* Input layer translation */
 }  ati_remote_tbl[] = {
         /* Directional control pad axes.  Code is xxyy */
-        {KIND_ACCEL,   0x70, EV_REL, 0xff00, 0},        /* left */
-        {KIND_ACCEL,   0x71, EV_REL, 0x0100, 0},        /* right */
-        {KIND_ACCEL,   0x72, EV_REL, 0x00ff, 0},        /* up */
-        {KIND_ACCEL,   0x73, EV_REL, 0x0001, 0},        /* down */
+        {KIND_ACCEL,    0x70, 0xff00},  /* left */
+        {KIND_ACCEL,    0x71, 0x0100},  /* right */
+        {KIND_ACCEL,    0x72, 0x00ff},  /* up */
+        {KIND_ACCEL,    0x73, 0x0001},  /* down */
 
         /* Directional control pad diagonals */
-        {KIND_ACCEL,   0x74, EV_REL, 0xffff, 0},        /* left up */
-        {KIND_ACCEL,   0x75, EV_REL, 0x01ff, 0},        /* right up */
-        {KIND_ACCEL,   0x77, EV_REL, 0xff01, 0},        /* left down */
-        {KIND_ACCEL,   0x76, EV_REL, 0x0101, 0},        /* right down */
-
-        /* "Mouse button" buttons */
-        {KIND_LITERAL, 0x78, EV_KEY, BTN_LEFT, 1}, /* left btn down */
-        {KIND_LITERAL, 0x79, EV_KEY, BTN_LEFT, 0}, /* left btn up */
-        {KIND_LITERAL, 0x7c, EV_KEY, BTN_RIGHT, 1},/* right btn down */
-        {KIND_LITERAL, 0x7d, EV_KEY, BTN_RIGHT, 0},/* right btn up */
+        {KIND_ACCEL,    0x74, 0xffff},  /* left up */
+        {KIND_ACCEL,    0x75, 0x01ff},  /* right up */
+        {KIND_ACCEL,    0x77, 0xff01},  /* left down */
+        {KIND_ACCEL,    0x76, 0x0101},  /* right down */
+
+        /* "Mouse button" buttons.  The code below uses the fact that the
+         * lsbit of the raw code is a down/up indicator. */
+        {KIND_LITERAL,  0x78, BTN_LEFT}, /* left btn down */
+        {KIND_LITERAL,  0x79, BTN_LEFT}, /* left btn up */
+        {KIND_LITERAL,  0x7c, BTN_RIGHT},/* right btn down */
+        {KIND_LITERAL,  0x7d, BTN_RIGHT},/* right btn up */
 
         /* Artificial "doubleclick" events are generated by the hardware.
          * They are mapped to the "side" and "extra" mouse buttons here. */
-        {KIND_FILTERED, 0x7a, EV_KEY, BTN_SIDE, 1}, /* left dblclick */
-        {KIND_FILTERED, 0x7e, EV_KEY, BTN_EXTRA, 1},/* right dblclick */
+        {KIND_FILTERED, 0x7a, BTN_SIDE}, /* left dblclick */
+        {KIND_FILTERED, 0x7e, BTN_EXTRA},/* right dblclick */
 
         /* Non-mouse events are handled by rc-core */
-        {KIND_END, 0x00, EV_MAX + 1, 0, 0}
+        {KIND_END, 0x00, 0}
 };
 
 /*
@@ -563,9 +562,12 @@ static void ati_remote_input_report(struct urb *urb)
         }
 
         if (index >= 0 && ati_remote_tbl[index].kind == KIND_LITERAL) {
-                input_event(dev, ati_remote_tbl[index].type,
-                        ati_remote_tbl[index].code,
-                        ati_remote_tbl[index].value);
+                /*
+                 * The lsbit of the raw key code is a down/up flag.
+                 * Invert it to match the input layer's conventions.
+                 */
+                input_event(dev, EV_KEY, ati_remote_tbl[index].code,
+                        !(data[2] & 1));
                 input_sync(dev);
 
                 ati_remote->old_jiffies = jiffies;
@@ -586,9 +588,9 @@ static void ati_remote_input_report(struct urb *urb)
                 ati_remote->old_data = data[2];
                 ati_remote->old_jiffies = now;
 
-                /* Ensure we skip at least the 4 first duplicate events (generated
-                 * by a single keypress), and continue skipping until repeat_delay
-                 * msecs have passed
+                /* Ensure we skip at least the 4 first duplicate events
+                 * (generated by a single keypress), and continue skipping
+                 * until repeat_delay msecs have passed.
                  */
                 if (ati_remote->repeat_count > 0 &&
                     (ati_remote->repeat_count < 5 ||
@@ -624,10 +626,8 @@ static void ati_remote_input_report(struct urb *urb)
                         return;
                 }
 
-                input_event(dev, ati_remote_tbl[index].type,
-                        ati_remote_tbl[index].code, 1);
-                input_event(dev, ati_remote_tbl[index].type,
-                        ati_remote_tbl[index].code, 0);
+                input_event(dev, EV_KEY, ati_remote_tbl[index].code, 1);
+                input_event(dev, EV_KEY, ati_remote_tbl[index].code, 0);
                 input_sync(dev);
 
         } else if (ati_remote_tbl[index].kind == KIND_ACCEL) {
@@ -738,7 +738,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
         idev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
         for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++)
-                if (ati_remote_tbl[i].type == EV_KEY)
+                if (ati_remote_tbl[i].kind == KIND_LITERAL ||
+                    ati_remote_tbl[i].kind == KIND_FILTERED)
                         set_bit(ati_remote_tbl[i].code, idev->keybit);
 
         input_set_drvdata(idev, ati_remote);