modpost: i2c aliases need no trailing wildcard

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

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 348d8687b7c9cad167c6d631ce9e5f1c2038bdf0..cea4a790e1e97170459576b8b68c94daf3e95cc9 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -51,6 +51,15 @@ do {                                                            \
                 sprintf(str + strlen(str), "*");                \
 } while(0)
 
+/* Always end in a wildcard, for future extension */
+static inline void add_wildcard(char *str)
+{
+       int len = strlen(str);
+
+       if (str[len - 1] != '*')
+               strcat(str + len, "*");
+}
+
 unsigned int cross_build = 0;
 /**
  * Check that sizeof(device_id type) are consistent with size of section
@@ -133,9 +142,7 @@ static void do_usb_entry(struct usb_device_id *id,
            id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
            id->bInterfaceProtocol);
 
-       /* Always end in a wildcard, for future extension */
-       if (alias[strlen(alias)-1] != '*')
-               strcat(alias, "*");
+       add_wildcard(alias);
        buf_printf(&mod->dev_table_buf,
                   "MODULE_ALIAS(\"%s\");\n", alias);
 }
@@ -219,6 +226,7 @@ static int do_ieee1394_entry(const char *filename,
        ADD(alias, "ver", id->match_flags & IEEE1394_MATCH_VERSION,
            id->version);
 
+       add_wildcard(alias);
        return 1;
 }
 
@@ -261,6 +269,7 @@ static int do_pci_entry(const char *filename,
        ADD(alias, "bc", baseclass_mask == 0xFF, baseclass);
        ADD(alias, "sc", subclass_mask == 0xFF, subclass);
        ADD(alias, "i", interface_mask == 0xFF, interface);
+       add_wildcard(alias);
        return 1;
 }
 
@@ -283,6 +292,7 @@ static int do_ccw_entry(const char *filename,
            id->dev_type);
        ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
            id->dev_model);
+       add_wildcard(alias);
        return 1;
 }
 
@@ -290,7 +300,7 @@ static int do_ccw_entry(const char *filename,
 static int do_ap_entry(const char *filename,
                       struct ap_device_id *id, char *alias)
 {
-       sprintf(alias, "ap:t%02X", id->dev_type);
+       sprintf(alias, "ap:t%02X*", id->dev_type);
        return 1;
 }
 
@@ -309,6 +319,7 @@ static int do_serio_entry(const char *filename,
        ADD(alias, "id", id->id != SERIO_ANY, id->id);
        ADD(alias, "ex", id->extra != SERIO_ANY, id->extra);
 
+       add_wildcard(alias);
        return 1;
 }
 
@@ -316,7 +327,7 @@ static int do_serio_entry(const char *filename,
 static int do_acpi_entry(const char *filename,
                        struct acpi_device_id *id, char *alias)
 {
-       sprintf(alias, "acpi*:%s:", id->id);
+       sprintf(alias, "acpi*:%s:*", id->id);
        return 1;
 }
 
@@ -324,23 +335,56 @@ static int do_acpi_entry(const char *filename,
 static int do_pnp_entry(const char *filename,
                        struct pnp_device_id *id, char *alias)
 {
-       sprintf(alias, "pnp:d%s", id->id);
+       sprintf(alias, "pnp:d%s*", id->id);
        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. */
@@ -376,6 +420,7 @@ static int do_pcmcia_entry(const char *filename,
        ADD(alias, "pc", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID3, id->prod_id_hash[2]);
        ADD(alias, "pd", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID4, id->prod_id_hash[3]);
 
+       add_wildcard(alias);
        return 1;
 }
 
@@ -399,6 +444,7 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
         if (isspace (*tmp))
             *tmp = '_';
 
+    add_wildcard(alias);
     return 1;
 }
 
@@ -415,6 +461,7 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
                if (isspace (*tmp))
                        *tmp = '_';
 
+       add_wildcard(alias);
        return 1;
 }
 
@@ -478,6 +525,8 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
 {
        if (eisa->sig[0])
                sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig);
+       else
+               strcat(alias, "*");
        return 1;
 }
 
@@ -496,6 +545,7 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
        ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev);
        ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion);
 
+       add_wildcard(alias);
        return 1;
 }
 
@@ -511,6 +561,7 @@ static int do_sdio_entry(const char *filename,
        ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class);
        ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor);
        ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device);
+       add_wildcard(alias);
        return 1;
 }
 
@@ -526,6 +577,7 @@ static int do_ssb_entry(const char *filename,
        ADD(alias, "v", id->vendor != SSB_ANY_VENDOR, id->vendor);
        ADD(alias, "id", id->coreid != SSB_ANY_ID, id->coreid);
        ADD(alias, "rev", id->revision != SSB_ANY_REV, id->revision);
+       add_wildcard(alias);
        return 1;
 }
 
@@ -540,6 +592,16 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
        ADD(alias, "d", 1, id->device);
        ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor);
 
+       add_wildcard(alias);
+       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;
 }
 
@@ -570,9 +632,6 @@ static void do_table(void *symval, unsigned long size,
 
        for (i = 0; i < size; i += id_size) {
                if (do_entry(mod->name, symval+i, alias)) {
-                       /* Always end in a wildcard, for future extension */
-                       if (alias[strlen(alias)-1] != '*')
-                               strcat(alias, "*");
                        buf_printf(&mod->dev_table_buf,
                                   "MODULE_ALIAS(\"%s\");\n", alias);
                }
@@ -634,9 +693,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 +730,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);
 }