Merge tag 'kbuild-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

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

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5bc02ce..4829680 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1348,13 +1348,13 @@ static int do_typec_entry(const char *filename, void *symval, char *alias)
 /* Looks like: tee:uuid */
 static int do_tee_entry(const char *filename, void *symval, char *alias)
 {
-       DEF_FIELD(symval, tee_client_device_id, uuid);
+       DEF_FIELD_ADDR(symval, tee_client_device_id, uuid);
 
        sprintf(alias, "tee:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-               uuid.b[0], uuid.b[1], uuid.b[2], uuid.b[3], uuid.b[4],
-               uuid.b[5], uuid.b[6], uuid.b[7], uuid.b[8], uuid.b[9],
-               uuid.b[10], uuid.b[11], uuid.b[12], uuid.b[13], uuid.b[14],
-               uuid.b[15]);
+               uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4],
+               uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9],
+               uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14],
+               uuid->b[15]);
 
        add_wildcard(alias);
        return 1;
@@ -1401,10 +1401,10 @@ static int do_mhi_ep_entry(const char *filename, void *symval, char *alias)
 /* Looks like: ishtp:{guid} */
 static int do_ishtp_entry(const char *filename, void *symval, char *alias)
 {
-       DEF_FIELD(symval, ishtp_device_id, guid);
+       DEF_FIELD_ADDR(symval, ishtp_device_id, guid);
 
        strcpy(alias, ISHTP_MODULE_PREFIX "{");
-       add_guid(alias, guid);
+       add_guid(alias, *guid);
        strcat(alias, "}");
 
        return 1;