github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: hda: tas2781-spi: Fix -Wsometimes-uninitialized in tasdevice_spi_switch_book()

Browse Source 
Clang warns (or errors with CONFIG_WERROR=y):

  sound/pci/hda/tas2781_hda_spi.c:110:6: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
    110 |         if (tas_priv->cur_book != TASDEVICE_BOOK_ID(reg)) {
        |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  sound/pci/hda/tas2781_hda_spi.c:119:9: note: uninitialized use occurs here
    119 |         return ret;
        |                ^~~
  sound/pci/hda/tas2781_hda_spi.c:110:2: note: remove the 'if' if its condition is always true
    110 |         if (tas_priv->cur_book != TASDEVICE_BOOK_ID(reg)) {
        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  sound/pci/hda/tas2781_hda_spi.c:108:9: note: initialize the variable 'ret' to silence this warning
    108 |         int ret;
        |                ^
        |                 = 0

Sink the declaration of ret into the if block and just return 0 at the
end of the function, as there is nothing to do if cur_book has already
been changed.

Fixes: bb5f86ea50 ("ALSA: hda/tas2781: Add tas2781 hda SPI driver")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501192006.Hm9GmKiV-lkp@intel.com/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://patch.msgid.link/20250120-tas2781_hda_spi-fix-wsometimes-uninitialized-v1-1-d7fd104aa63e@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Nathan Chancellor 2025-01-20 06:32:48 -07:00 committed by Takashi Iwai
parent e576e7843c
commit 1256961d86
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/pci/hda/tas2781_hda_spi.c
View File

@ -105,18 +105,17 @@ static const struct regmap_config tasdevice_regmap = {
static int tasdevice_spi_switch_book(struct tasdevice_priv *tas_priv, int reg)
{
struct regmap *map = tas_priv->regmap;
int ret;
if (tas_priv->cur_book != TASDEVICE_BOOK_ID(reg)) {
ret = regmap_write(map, TASDEVICE_BOOKCTL_REG,
TASDEVICE_BOOK_ID(reg));
int ret = regmap_write(map, TASDEVICE_BOOKCTL_REG,
TASDEVICE_BOOK_ID(reg));
if (ret < 0) {
dev_err(tas_priv->dev, "Switch Book E=%d\n", ret);
return ret;
}
tas_priv->cur_book = TASDEVICE_BOOK_ID(reg);
}
return ret;
return 0;
}
int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv,