1 files changed, 57 insertions, 13 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 348d8687b7c9..e04c4218cb52 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -328,19 +328,52 @@ static int do_pnp_entry(const char *filename,
         return 1;
 }
 
-/* looks like: "pnp:cCdD..." */
-static int do_pnp_card_entry(const char *filename,
-                        struct pnp_card_device_id *id, char *alias)
+/* looks like: "pnp:dD" for every device of the card */
+static void do_pnp_card_entries(void *symval, unsigned long size,
+                                struct module *mod)
 {
-        int i;
+        const unsigned long id_size = sizeof(struct pnp_card_device_id);
+        const unsigned int count = (size / id_size)-1;
+        const struct pnp_card_device_id *cards = symval;
+        unsigned int i;
 
-        sprintf(alias, "pnp:c%s", id->id);
-        for (i = 0; i < PNP_MAX_DEVICES; i++) {
-                if (! *id->devs[i].id)
-                        break;
-                sprintf(alias + strlen(alias), "d%s", id->devs[i].id);
+        device_id_check(mod->name, "pnp", size, id_size, symval);
+
+        for (i = 0; i < count; i++) {
+                unsigned int j;
+                const struct pnp_card_device_id *card = &cards[i];
+
+                for (j = 0; j < PNP_MAX_DEVICES; j++) {
+                        const char *id = (char *)card->devs[j].id;
+                        int i2, j2;
+                        int dup = 0;
+
+                        if (!id[0])
+                                break;
+
+                        /* find duplicate, already added value */
+                        for (i2 = 0; i2 < i && !dup; i2++) {
+                                const struct pnp_card_device_id *card2 = &cards[i2];
+
+                                for (j2 = 0; j2 < PNP_MAX_DEVICES; j2++) {
+                                        const char *id2 = (char *)card2->devs[j2].id;
+
+                                        if (!id2[0])
+                                                break;
+
+                                        if (!strcmp(id, id2)) {
+                                                dup = 1;
+                                                break;
+                                        }
+                                }
+                        }
+
+                        /* add an individual alias for every device entry */
+                        if (!dup)
+                                buf_printf(&mod->dev_table_buf,
+                                           "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+                }
         }
-        return 1;
 }
 
 /* Looks like: pcmcia:mNcNfNfnNpfnNvaNvbNvcNvdN. */
@@ -543,6 +576,15 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         return 1;
 }
 
+/* Looks like: i2c:S */
+static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
+                        char *alias)
+{
+        sprintf(alias, I2C_MODULE_PREFIX "%s", id->name);
+
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -634,9 +676,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                          sizeof(struct pnp_device_id), "pnp",
                          do_pnp_entry, mod);
         else if (sym_is(symname, "__mod_pnp_card_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pnp_card_device_id), "pnp_card",
-                         do_pnp_card_entry, mod);
+                do_pnp_card_entries(symval, sym->st_size, mod);
         else if (sym_is(symname, "__mod_pcmcia_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct pcmcia_device_id), "pcmcia",
@@ -673,6 +713,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct virtio_device_id), "virtio",
                          do_virtio_entry, mod);
+        else if (sym_is(symname, "__mod_i2c_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct i2c_device_id), "i2c",
+                         do_i2c_entry, mod);
         free(zeros);
 }