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;
Date:   Wed, 9 Nov 2022 21:40:55 +0100
From:   Nicolas Schier <nicolas@fjasle.eu>
To:     Geert Uytterhoeven <geert+renesas@glider.be>
Cc:     Masahiro Yamada <masahiroy@kernel.org>,
        Michal Marek <michal.lkml@markovi.net>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Luis Chamberlain <mcgrof@kernel.org>,
        linux-kbuild@vger.kernel.org, linux-modules@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] modpost: Join broken long printed messages
Message-ID: <Y2wQV6JX0nbkpGtL@bergen.fjasle.eu>
References: <d7365c44c13b563e9576cf23bd68d64e5ea57f6f.1668000538.git.geert+renesas@glider.be>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="C1efxTHKFb4PJVpW"
Content-Disposition: inline
In-Reply-To: <d7365c44c13b563e9576cf23bd68d64e5ea57f6f.1668000538.git.geert+renesas@glider.be>
Jabber-ID: nicolas@jabber.no
Precedence: bulk


--C1efxTHKFb4PJVpW
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed 09 Nov 2022 14:30:55 GMT Geert Uytterhoeven wrote:
> Breaking long printed messages in multiple lines makes it very hard to
> look up where they originated from.
>=20
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---

thanks, I do appreciate such changes!

Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

>  scripts/mod/file2alias.c | 18 +++++++-----------
>  scripts/mod/modpost.c    |  8 +++-----
>  2 files changed, 10 insertions(+), 16 deletions(-)
>=20
> 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, co=
nst char *device_id,
>  	int i;
> =20
>  	if (size % id_size || size < id_size) {
> -		fatal("%s: sizeof(struct %s_device_id)=3D%lu is not a modulo "
> -		      "of the size of "
> -		      "section __mod_%s__<identifier>_device_table=3D%lu.\n"
> -		      "Fix definition of struct %s_device_id "
> -		      "in mod_devicetable.h\n",
> +		fatal("%s: sizeof(struct %s_device_id)=3D%lu is not a modulo of the si=
ze of section __mod_%s__<identifier>_device_table=3D%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 =3D 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 =3D 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);
> =20
>  	if ((id & mask) !=3D id)
> -		fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
> -		      "id=3D0x%08X, mask=3D0x%08X.  Please fix this driver.\n",
> +		fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: id=3D0x%0=
8X, mask=3D0x%08X.  Please fix this driver.\n",
>  		      filename, id, mask);
> =20
>  	p +=3D 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 cha=
r *filename)
>  		int nobits =3D sechdrs[i].sh_type =3D=3D SHT_NOBITS;
> =20
>  		if (!nobits && sechdrs[i].sh_offset > info->size) {
> -			fatal("%s is truncated. sechdrs[i].sh_offset=3D%lu > "
> -			      "sizeof(*hrd)=3D%zu\n", filename,
> -			      (unsigned long)sechdrs[i].sh_offset,
> +			fatal("%s is truncated. sechdrs[i].sh_offset=3D%lu > sizeof(*hrd)=3D%=
zu\n",
> +			      filename, (unsigned long)sechdrs[i].sh_offset,
>  			      sizeof(*hdr));
>  			return 0;
>  		}
> @@ -1355,8 +1354,7 @@ static void report_extable_warnings(const char* mod=
name, struct elf_info* elf,
>  	get_pretty_name(is_function(tosym),
>  			&to_pretty_name, &to_pretty_name_p);
> =20
> -	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 t=
he %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);
> --=20
> 2.25.1

--=20
epost|xmpp: nicolas@fjasle.eu          irc://oftc.net/nsc
=E2=86=B3 gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --

--C1efxTHKFb4PJVpW
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh0E3p4c3JKeBvsLGB1IKcBYmEmkFAmNsEFIACgkQB1IKcBYm
EmnqkBAAyHxGSkc1QiZy0ks7S6hWW5047gXf3CRy7XGmEEy5lE/5ljMYFnkQ9rkY
c/FvuVwBsjq45sUEj4T5u+EbN2TJiGQaFfWPrflkJ7qq2iCTClIf0zJMWwIXlwIH
OL9zqXYgTNcNlkkyzpNLcB2VceAsX9TDLRj7UlXik3AcXFlktIYHeOqqZ00kQ+kW
AXuTuQjX7mf/IKVNT+Th1lv/1oRhXvBlX99ebD6MoaN1KbQt6Ce2sNUzBbOar+eY
nofkEKYgqWECrtBxjDq01eeXk36LNmOXbeuhPvmt8kjFSbM1pf7Ji+W/Zft0bSCU
AsxR5KSFAqTatVcPukyxDrFIXj2iixnIijT3PPvTrO3PWLid8UpT/0w/W4hpYpP3
jy+GbnVdJ1IFlvA34aKrKMP+OtxhRnj7oMtqKKgJz7LrFLl3veESwxYDI2FADNXk
lzaIy/oe59qW9HJp7hoH5Z9QtD6yZwB6f/GOcTGT2hB80c/dLMgLK5f++y9wGNtO
9u5ERmNbMy7bdofLjQqpttEfwfOkEc2NSY6dC1d9hKwinLap/Ww0lPm/K3N2V6+D
SFvUUW71+PDSXyZhPy200rp++pp7JR+wdRfmGGODG/TXn8NEhda2NQXxwpNOeDr3
TfHJ83W6oZ8SerhZsf6h6EwUpaW4qh+N5QYhmk7/hZYJbsUDNR0=
=9+nj
-----END PGP SIGNATURE-----

--C1efxTHKFb4PJVpW--