From patchwork Wed Nov 9 13:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 17541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp337266wru; Wed, 9 Nov 2022 05:37:08 -0800 (PST) X-Google-Smtp-Source: AMsMyM6NHkMeow41akKWS1b5wbmdbDpJi5A7nw/+rimY8umJsBIxpTGCetnD1uCiKsKhiJdYleIv X-Received: by 2002:a05:6a00:4217:b0:56e:3a98:11a5 with SMTP id cd23-20020a056a00421700b0056e3a9811a5mr34482368pfb.13.1668001028119; Wed, 09 Nov 2022 05:37:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668001028; cv=none; d=google.com; s=arc-20160816; b=q8wSvdh6AVVzE3FeKptxPxYO3c+ICX4iYJ+BWHC9JktwROIDzZ2icDh5n5aJIwtpx8 MwAWn/5EfECBzbKbsd/ttQ1KLmanH/BmCCzBXZU7y8+x6WIiiNgO3WjEuvAEFgrMHYwT gFl45oOLfapB7JDO8upbHIQI7P2QhFfSsdq8CxK67KbJl/W9MFn+XCXtOpgcaF7G3rOi 2djzDVOckYIrM9P0zM6vkQdsdlm15aBvUnAaLdIxn7oktAesNu2ez9yL2kQwhE25LL40 5MLllQc5fFR5W7INgmIOLJ83rLggNfXh+pjUZ33QHOFbWWVoYehQL6Z4v1IwQChfmWPP YIXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=MbANamR26jbjEgKmY4NNzPW6ucIVEfmJYfxusjK1gfI=; b=p0R07Y8J90mCZpe3Dqll2u5YQCQQgtMH4uUVgnb0aOnHotpt8i30VH44JlD/9YI0it CgJmW3x/gZTMJJBbhQ7jYDV0F8lhUE1VmtjuEaive1AONp8+Q3mK5rzupfwtk+K5Dua1 YzKWby5B4Gr9Zl8wITitjhjvvSUFadEoqqX3jhFJxJctYBvU00QTaiLvqvlYnq6aBT8g Af49SOn5+FWmRsXauDu0BNMTbn8U/9mgav8dDFn+ITPoBgXHNToEaXhCEpU1gwwwOaZ4 iiot41jhUOLAeMOr5/w0KUsOAL69h4KnmqWNc9sIsJogJL2TsRE5veMgQ3Wz+alWd+1z xr/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y22-20020a63fa16000000b0044c7a49bef7si17940093pgh.259.2022.11.09.05.36.54; Wed, 09 Nov 2022 05:37:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230053AbiKINbF (ORCPT + 99 others); Wed, 9 Nov 2022 08:31:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbiKINbD (ORCPT ); Wed, 9 Nov 2022 08:31:03 -0500 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 402B72019B for ; Wed, 9 Nov 2022 05:31:01 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed10:410d:c657:be54:f60b]) by baptiste.telenet-ops.be with bizsmtp id iDWy2800547WmLZ01DWyVa; Wed, 09 Nov 2022 14:30:58 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oslAP-0006eV-NE; Wed, 09 Nov 2022 14:30:57 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1oslAP-001cAv-3O; Wed, 09 Nov 2022 14:30:57 +0100 From: Geert Uytterhoeven To: Masahiro Yamada , Michal Marek , Nick Desaulniers , Luis Chamberlain Cc: linux-kbuild@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] modpost: Join broken long printed messages Date: Wed, 9 Nov 2022 14:30:55 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749025846148068086?= X-GMAIL-MSGID: =?utf-8?q?1749025846148068086?= Breaking long printed messages in multiple lines makes it very hard to look up where they originated from. Signed-off-by: Geert Uytterhoeven Reviewed-by: Nicolas Schier --- scripts/mod/file2alias.c | 18 +++++++----------- scripts/mod/modpost.c | 8 +++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 80d973144fded3b1..7df23905fdf1cb36 100644 --- 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___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___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 2c80da0220c326ef..56d856f2e5115150 100644 --- 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);