modpost: convert do_of_table() to a generic handler

do_of_table() no longer needs to iterate over the of_device_id array.

Convert it to a generic ->do_entry() handler.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index cacfa0de634bd433962e9f2c903b0ad98195f7cc..7f079a3857b2bc63405779bb197916474217f0ac 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -398,7 +398,7 @@ static void do_usb_table(void *symval, unsigned long size,
                do_usb_entry_multi(symval + i, mod);
 }
 
-static void do_of_entry_multi(void *symval, struct module *mod)
+static void do_of_entry(struct module *mod, void *symval)
 {
        char alias[500];
        int len;
@@ -424,21 +424,6 @@ static void do_of_entry_multi(void *symval, struct module *mod)
        module_alias_printf(mod, false, "%sC*", alias);
 }
 
-static void do_of_table(void *symval, unsigned long size,
-                       struct module *mod)
-{
-       unsigned int i;
-       const unsigned long id_size = SIZE_of_device_id;
-
-       device_id_check(mod->name, "of", size, id_size, symval);
-
-       /* Leave last one: it's the terminator. */
-       size -= id_size;
-
-       for (i = 0; i < size; i += id_size)
-               do_of_entry_multi(symval + i, mod);
-}
-
 /* Looks like: hid:bNvNpN */
 static void do_hid_entry(struct module *mod, void *symval)
 {
@@ -1520,6 +1505,7 @@ static const struct devtable devtable[] = {
        {"cdx", SIZE_cdx_device_id, do_cdx_entry},
        {"vchiq", SIZE_vchiq_device_id, do_vchiq_entry},
        {"coreboot", SIZE_coreboot_device_id, do_coreboot_entry},
+       {"of", SIZE_of_device_id, do_of_entry},
        {"pnp", SIZE_pnp_device_id, do_pnp_device_entry},
        {"pnp_card", SIZE_pnp_card_device_id, do_pnp_card_entry},
 };
@@ -1568,8 +1554,6 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        /* First handle the "special" cases */
        if (sym_is(name, namelen, "usb"))
                do_usb_table(symval, sym->st_size, mod);
-       else if (sym_is(name, namelen, "of"))
-               do_of_table(symval, sym->st_size, mod);
        else {
                int i;