Received-SPF: pass (google.com: domain of linux-kernel+bounces-197136-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Date: Fri, 31 May 2024 19:19:12 +0300 (EEST)
To: Armin Wolf <W_Armin@gmx.de>
cc: Hans de Goede <hdegoede@redhat.com>, platform-driver-x86@vger.kernel.org, 
    LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] platform/x86: dell-smbios: Simplify error
 handling
In-Reply-To: <20240528204903.445546-2-W_Armin@gmx.de>
Message-ID: <8353e3d0-7553-50f9-160b-fa8b6df2f067@linux.intel.com>
References: <20240528204903.445546-1-W_Armin@gmx.de> <20240528204903.445546-2-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-1046594730-1717172352=:8458"

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-1046594730-1717172352=:8458
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: QUOTED-PRINTABLE

On Tue, 28 May 2024, Armin Wolf wrote:

> When the allocation of value_name fails, the error handling code
> uses two gotos for error handling, which is not necessary.
>=20
> Simplify the error handling in this case by only using a single goto.
>=20
> Tested on a Dell Inspiron 3505.
>=20
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
> Changes since v1:
> - add patch
> ---
>  drivers/platform/x86/dell/dell-smbios-base.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
>=20
> diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platf=
orm/x86/dell/dell-smbios-base.c
> index 86b95206cb1b..b562ed99ec4e 100644
> --- a/drivers/platform/x86/dell/dell-smbios-base.c
> +++ b/drivers/platform/x86/dell/dell-smbios-base.c
> @@ -492,19 +492,16 @@ static int build_tokens_sysfs(struct platform_devic=
e *dev)
>  =09=09/* add value */
>  =09=09value_name =3D kasprintf(GFP_KERNEL, "%04x_value",
>  =09=09=09=09       da_tokens[i].tokenID);
> -=09=09if (value_name =3D=3D NULL)
> -=09=09=09goto loop_fail_create_value;
> +=09=09if (!value_name) {
> +=09=09=09kfree(location_name);
> +=09=09=09goto out_unwind_strings;
> +=09=09}
>=20
>  =09=09sysfs_attr_init(&token_entries[i].value_attr.attr);
>  =09=09token_entries[i].value_attr.attr.name =3D value_name;
>  =09=09token_entries[i].value_attr.attr.mode =3D 0444;
>  =09=09token_entries[i].value_attr.show =3D value_show;
>  =09=09token_attrs[j++] =3D &token_entries[i].value_attr.attr;
> -=09=09continue;
> -
> -loop_fail_create_value:
> -=09=09kfree(location_name);
> -=09=09goto out_unwind_strings;
>  =09}
>  =09smbios_attribute_group.attrs =3D token_attrs;

Good cleanup. Using continue on the main level of a loop is almost never a=
=20
good idea.

Reviewed-by: Ilpo J=E4rvinen <ilpo.jarvinen@linux.intel.com>

--=20
 i.

--8323328-1046594730-1717172352=:8458--