Input: move input_device_id to mod_devicetable.h

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 17 insertions, 19 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 84e21201f3c..37f67c23e11 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -374,10 +374,10 @@ static void do_input(char *alias,
                      kernel_ulong_t *arr, unsigned int min, unsigned int max)
 {
         unsigned int i;
-        for (i = min; i < max; i++) {
-                if (arr[i/BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
-                        sprintf(alias+strlen(alias), "%X,*", i);
-        }
+
+        for (i = min; i < max; i++)
+                if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
+                        sprintf(alias + strlen(alias), "%X,*", i);
 }
 
 /* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */
@@ -386,39 +386,37 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
 {
         sprintf(alias, "input:");
 
-        ADD(alias, "b", id->flags&INPUT_DEVICE_ID_MATCH_BUS, id->id.bustype);
-        ADD(alias, "v", id->flags&INPUT_DEVICE_ID_MATCH_VENDOR, id->id.vendor);
-        ADD(alias, "p", id->flags&INPUT_DEVICE_ID_MATCH_PRODUCT,
-            id->id.product);
-        ADD(alias, "e", id->flags&INPUT_DEVICE_ID_MATCH_VERSION,
-            id->id.version);
+        ADD(alias, "b", id->flags & INPUT_DEVICE_ID_MATCH_BUS, id->bustype);
+        ADD(alias, "v", id->flags & INPUT_DEVICE_ID_MATCH_VENDOR, id->vendor);
+        ADD(alias, "p", id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT, id->product);
+        ADD(alias, "e", id->flags & INPUT_DEVICE_ID_MATCH_VERSION, id->version);
 
         sprintf(alias + strlen(alias), "-e*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_EVBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_EVBIT)
                 do_input(alias, id->evbit, 0, EV_MAX);
         sprintf(alias + strlen(alias), "k*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_KEYBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_KEYBIT)
                 do_input(alias, id->keybit, KEY_MIN_INTERESTING, KEY_MAX);
         sprintf(alias + strlen(alias), "r*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_RELBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_RELBIT)
                 do_input(alias, id->relbit, 0, REL_MAX);
         sprintf(alias + strlen(alias), "a*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_ABSBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_ABSBIT)
                 do_input(alias, id->absbit, 0, ABS_MAX);
         sprintf(alias + strlen(alias), "m*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_MSCIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_MSCIT)
                 do_input(alias, id->mscbit, 0, MSC_MAX);
         sprintf(alias + strlen(alias), "l*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_LEDBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_LEDBIT)
                 do_input(alias, id->ledbit, 0, LED_MAX);
         sprintf(alias + strlen(alias), "s*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_SNDBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_SNDBIT)
                 do_input(alias, id->sndbit, 0, SND_MAX);
         sprintf(alias + strlen(alias), "f*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_FFBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_FFBIT)
                 do_input(alias, id->ffbit, 0, FF_MAX);
         sprintf(alias + strlen(alias), "w*");
-        if (id->flags&INPUT_DEVICE_ID_MATCH_SWBIT)
+        if (id->flags & INPUT_DEVICE_ID_MATCH_SWBIT)
                 do_input(alias, id->swbit, 0, SW_MAX);
         return 1;
 }