]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: rt1320: Change return type of rt1320_t0_load() to void
authorNathan Chancellor <nathan@kernel.org>
Fri, 19 Dec 2025 23:08:08 +0000 (16:08 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 22 Dec 2025 09:02:03 +0000 (09:02 +0000)
Clang warns (or errors with CONFIG_WERROR=y / W=e):

  sound/soc/codecs/rt1320-sdw.c:1387:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
   1387 |         if (!fw_ready) {
        |             ^~~~~~~~~
  sound/soc/codecs/rt1320-sdw.c:1421:9: note: uninitialized use occurs here
   1421 |         return ret;
        |                ^~~
  sound/soc/codecs/rt1320-sdw.c:1387:2: note: remove the 'if' if its condition is always false
   1387 |         if (!fw_ready) {
        |         ^~~~~~~~~~~~~~~~
   1388 |                 dev_warn(dev, "%s, DSP FW is NOT ready\n", __func__);
        |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   1389 |                 goto _exit_;
        |                 ~~~~~~~~~~~~
   1390 |         }
        |         ~
  sound/soc/codecs/rt1320-sdw.c:1366:9: note: initialize the variable 'ret' to silence this warning
   1366 |         int ret;
        |                ^
        |                 = 0

The return value of rt1320_t0_load() is never actually used, so it can
just be eliminated altogether by returning void, clearing up the
warning.

Fixes: da1682d5e8b5 ("ASoC: rt1320: support calibration and temperature/r0 loading")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202512191711.wY6XU796-lkp@intel.com/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Shuming Fan <shumingf@realtek.com>
Link: https://patch.msgid.link/20251219-rt1320-sdw-avoid-uninit-ret-v1-1-faa3e250ebc4@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt1320-sdw.c

index e31d0dcb5b758e428c2025dedbce568a09602dea..00eb792048356e5099eb5b086a64e89dbf383409 100644 (file)
@@ -1359,13 +1359,12 @@ static void rt1320_vab_preset(struct rt1320_sdw_priv *rt1320)
        }
 }
 
-static int rt1320_t0_load(struct rt1320_sdw_priv *rt1320, unsigned int l_t0, unsigned int r_t0)
+static void rt1320_t0_load(struct rt1320_sdw_priv *rt1320, unsigned int l_t0, unsigned int r_t0)
 {
        struct device *dev = &rt1320->sdw_slave->dev;
        unsigned int factor = (1 << 22), fw_ready;
        int l_t0_data[38], r_t0_data[38];
        unsigned int fw_status_addr;
-       int ret;
 
        switch (rt1320->dev_id) {
        case RT1320_DEV_ID:
@@ -1376,7 +1375,7 @@ static int rt1320_t0_load(struct rt1320_sdw_priv *rt1320, unsigned int l_t0, uns
                break;
        default:
                dev_err(dev, "%s: Unknown device ID %d\n", __func__, rt1320->dev_id);
-               return -EINVAL;
+               return;
        }
 
        regmap_write(rt1320->regmap,
@@ -1401,8 +1400,7 @@ static int rt1320_t0_load(struct rt1320_sdw_priv *rt1320, unsigned int l_t0, uns
 
        rt1320_fw_param_protocol(rt1320, RT1320_SET_PARAM, 3, &l_t0_data[0], sizeof(l_t0_data));
        rt1320_fw_param_protocol(rt1320, RT1320_SET_PARAM, 4, &r_t0_data[0], sizeof(r_t0_data));
-       ret = rt1320_check_fw_ready(rt1320);
-       if (ret < 0)
+       if (rt1320_check_fw_ready(rt1320) < 0)
                dev_err(dev, "%s: Failed to set FW param 3,4!\n", __func__);
 
        rt1320->temp_l_calib = l_t0;
@@ -1419,8 +1417,6 @@ _exit_:
                        SDW_SDCA_CTL(FUNC_NUM_AMP, RT1320_SDCA_ENT_PDE23,
                                RT1320_SDCA_CTL_REQ_POWER_STATE, 0), 0x03);
        rt1320_pde_transition_delay(rt1320, FUNC_NUM_AMP, RT1320_SDCA_ENT_PDE23, 0x03);
-
-       return ret;
 }
 
 static int rt1320_rae_load(struct rt1320_sdw_priv *rt1320)