PNP: fix broken pnp lowercasing for acpi module aliases

[linux-2.6-omap-h63xx.git] / scripts / mod / file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 473f94e56eade0f26195a6afadc90559a11cef2c..491b8b1b6abf326cd1e018c813d14fbbd0402e0b 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -206,6 +206,20 @@ static void do_usb_table(void *symval, unsigned long size,
                do_usb_entry_multi(symval + i, mod);
 }
 
+/* Looks like: hid:bNvNpN */
+static int do_hid_entry(const char *filename,
+                            struct hid_device_id *id, char *alias)
+{
+       id->vendor = TO_NATIVE(id->vendor);
+       id->product = TO_NATIVE(id->product);
+
+       sprintf(alias, "hid:b%04X", id->bus);
+       ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
+       ADD(alias, "p", id->product != HID_ANY_ID, id->product);
+
+       return 1;
+}
+
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
                             struct ieee1394_device_id *id, char *alias)
@@ -352,11 +366,17 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
 
        for (i = 0; i < count; i++) {
                const char *id = (char *)devs[i].id;
+               char acpi_id[sizeof(devs[0].id)];
+               int j;
 
                buf_printf(&mod->dev_table_buf,
                           "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+
+               /* fix broken pnp bus lowercasing */
+               for (j = 0; j < sizeof(acpi_id); j++)
+                       acpi_id[j] = toupper(id[j]);
                buf_printf(&mod->dev_table_buf,
-                          "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+                          "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);
        }
 }
 
@@ -402,10 +422,17 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
 
                        /* add an individual alias for every device entry */
                        if (!dup) {
+                               char acpi_id[sizeof(card->devs[0].id)];
+                               int k;
+
                                buf_printf(&mod->dev_table_buf,
                                           "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+
+                               /* fix broken pnp bus lowercasing */
+                               for (k = 0; k < sizeof(acpi_id); k++)
+                                       acpi_id[k] = toupper(id[k]);
                                buf_printf(&mod->dev_table_buf,
-                                          "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+                                          "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);
                        }
                }
        }
@@ -745,6 +772,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        else if (sym_is(symname, "__mod_usb_device_table"))
                /* special case to handle bcdDevice ranges */
                do_usb_table(symval, sym->st_size, mod);
+       else if (sym_is(symname, "__mod_hid_device_table"))
+               do_table(symval, sym->st_size,
+                        sizeof(struct hid_device_id), "hid",
+                        do_hid_entry, mod);
        else if (sym_is(symname, "__mod_ieee1394_device_table"))
                do_table(symval, sym->st_size,
                         sizeof(struct ieee1394_device_id), "ieee1394",