modpost: Join broken long printed messages

Breaking long printed messages in multiple lines makes it very hard to
look up where they originated from.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 80d973144fded3b181e07612450b074e83925cfe..7df23905fdf1cb364913514590f2903fbfcf1d49 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -140,25 +140,22 @@ static void device_id_check(const char *modname, const char *device_id,
        int i;
 
        if (size % id_size || size < id_size) {
-               fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
-                     "of the size of "
-                     "section __mod_%s__<identifier>_device_table=%lu.\n"
-                     "Fix definition of struct %s_device_id "
-                     "in mod_devicetable.h\n",
+               fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo of the size of section __mod_%s__<identifier>_device_table=%lu.\n"
+                     "Fix definition of struct %s_device_id in mod_devicetable.h\n",
                      modname, device_id, id_size, device_id, size, device_id);
        }
        /* Verify last one is a terminator */
        for (i = 0; i < id_size; i++ ) {
                if (*(uint8_t*)(symval+size-id_size+i)) {
-                       fprintf(stderr,"%s: struct %s_device_id is %lu bytes.  "
-                               "The last of %lu is:\n",
+                       fprintf(stderr,
+                               "%s: struct %s_device_id is %lu bytes.  The last of %lu is:\n",
                                modname, device_id, id_size, size / id_size);
                        for (i = 0; i < id_size; i++ )
                                fprintf(stderr,"0x%02x ",
                                        *(uint8_t*)(symval+size-id_size+i) );
                        fprintf(stderr,"\n");
-                       fatal("%s: struct %s_device_id is not terminated "
-                               "with a NULL entry!\n", modname, device_id);
+                       fatal("%s: struct %s_device_id is not terminated with a NULL entry!\n",
+                             modname, device_id);
                }
        }
 }
@@ -1154,8 +1151,7 @@ static int do_amba_entry(const char *filename,
        DEF_FIELD(symval, amba_id, mask);
 
        if ((id & mask) != id)
-               fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
-                     "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
+               fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
                      filename, id, mask);
 
        p += sprintf(alias, "amba:d");

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 2c80da0220c326efbe4fb7598054cef04ad3566e..56d856f2e5115150ec5648da9f839fad2836a5fc 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -519,9 +519,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
                if (!nobits && sechdrs[i].sh_offset > info->size) {
-                       fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
-                             "sizeof(*hrd)=%zu\n", filename,
-                             (unsigned long)sechdrs[i].sh_offset,
+                       fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%zu\n",
+                             filename, (unsigned long)sechdrs[i].sh_offset,
                              sizeof(*hdr));
                        return 0;
                }
@@ -1355,8 +1354,7 @@ static void report_extable_warnings(const char* modname, struct elf_info* elf,
        get_pretty_name(is_function(tosym),
                        &to_pretty_name, &to_pretty_name_p);
 
-       warn("%s(%s+0x%lx): Section mismatch in reference"
-            " from the %s %s%s to the %s %s:%s%s\n",
+       warn("%s(%s+0x%lx): Section mismatch in reference from the %s %s%s to the %s %s:%s%s\n",
             modname, fromsec, (long)r->r_offset, from_pretty_name,
             fromsym_name, from_pretty_name_p,
             to_pretty_name, tosec, tosym_name, to_pretty_name_p);