[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <871q1k9icg.wl-tiwai@suse.de>
Date: Mon, 16 Sep 2024 09:18:55 +0200
From: Takashi Iwai <tiwai@...e.de>
To: Markus Elfring <Markus.Elfring@....de>
Cc: linux-sound@...r.kernel.org,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ALSA: i2c: cs8427: Use common code in snd_cs8427_qsubcode_get()
On Sun, 15 Sep 2024 13:48:51 +0200,
Markus Elfring wrote:
>
> From: Markus Elfring <elfring@...rs.sourceforge.net>
> Date: Sun, 15 Sep 2024 13:38:29 +0200
>
> Add two labels so that a bit of exception handling can be better reused
> at the end of this function implementation.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
The double goto jumps aren't nice, either.
I guess we can do clean up better with cleanup.h stuff.
thanks,
Takashi
> ---
> sound/i2c/cs8427.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
> index 29a1a7a0d050..ee650006cac4 100644
> --- a/sound/i2c/cs8427.c
> +++ b/sound/i2c/cs8427.c
> @@ -397,18 +397,25 @@ static int snd_cs8427_qsubcode_get(struct snd_kcontrol *kcontrol,
> if (err != 1) {
> dev_err(device->bus->card->dev,
> "unable to send register 0x%x byte to CS8427\n", reg);
> - snd_i2c_unlock(device->bus);
> - return err < 0 ? err : -EIO;
> + goto recheck_err;
> }
> err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10);
> if (err != 10) {
> dev_err(device->bus->card->dev,
> "unable to read Q-subcode bytes from CS8427\n");
> - snd_i2c_unlock(device->bus);
> - return err < 0 ? err : -EIO;
> + goto recheck_err;
> }
> +
> + err = 0;
> +unlock:
> snd_i2c_unlock(device->bus);
> - return 0;
> + return err;
> +
> +recheck_err:
> + if (err >= 0)
> + err = -EIO;
> +
> + goto unlock;
> }
>
> static int snd_cs8427_spdif_info(struct snd_kcontrol *kcontrol,
> --
> 2.46.0
>
Powered by blists - more mailing lists