ASoC: cs42l52: Minor tidy up of error paths

Fixup a needlessly initialised variable and an unchecked return
value.

Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210511101051.17726-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 796b894..88547e2 100644 (file)
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1093,7 +1093,7 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
        struct cs42l52_private *cs42l52;
        struct cs42l52_platform_data *pdata = dev_get_platdata(&i2c_client->dev);
        int ret;
-       unsigned int devid = 0;
+       unsigned int devid;
        unsigned int reg;
        u32 val32;
 
@@ -1163,6 +1163,11 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
                         ret);
 
        ret = regmap_read(cs42l52->regmap, CS42L52_CHIP, &reg);
+       if (ret) {
+               dev_err(&i2c_client->dev, "Failed to read chip ID: %d\n", ret);
+               return ret;
+       }
+
        devid = reg & CS42L52_CHIP_ID_MASK;
        if (devid != CS42L52_CHIP_ID) {
                ret = -ENODEV;
@@ -1199,11 +1204,8 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
                                   CS42L52_IFACE_CTL2_BIAS_LVL,
                                cs42l52->pdata.micbias_lvl);
 
-       ret =  devm_snd_soc_register_component(&i2c_client->dev,
+       return devm_snd_soc_register_component(&i2c_client->dev,
                        &soc_component_dev_cs42l52, &cs42l52_dai, 1);
-       if (ret < 0)
-               return ret;
-       return 0;
 }
 
 static const struct of_device_id cs42l52_of_match[] = {