Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[people/ms/linux.git] / sound / soc / codecs / cs53l30.c

diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index abe0cc0bc03a94bf6d4838eb56e6d0235a55e7e0..f2087bd38dbc81d484a1bb88edbbff6345203696 100644 (file)
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -20,6 +20,7 @@
 #include <sound/tlv.h>
 
 #include "cs53l30.h"
+#include "cirrus_legacy.h"
 
 #define CS53L30_NUM_SUPPLIES 2
 static const char *const cs53l30_supply_names[CS53L30_NUM_SUPPLIES] = {
@@ -923,9 +924,8 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
        const struct device_node *np = client->dev.of_node;
        struct device *dev = &client->dev;
        struct cs53l30_private *cs53l30;
-       unsigned int devid = 0;
        unsigned int reg;
-       int ret = 0, i;
+       int ret = 0, i, devid;
        u8 val;
 
        cs53l30 = devm_kzalloc(dev, sizeof(*cs53l30), GFP_KERNEL);
@@ -954,7 +954,7 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
                                                      GPIOD_OUT_LOW);
        if (IS_ERR(cs53l30->reset_gpio)) {
                ret = PTR_ERR(cs53l30->reset_gpio);
-               goto error;
+               goto error_supplies;
        }
 
        gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
@@ -971,14 +971,12 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
        }
 
        /* Initialize codec */
-       ret = regmap_read(cs53l30->regmap, CS53L30_DEVID_AB, &reg);
-       devid = reg << 12;
-
-       ret = regmap_read(cs53l30->regmap, CS53L30_DEVID_CD, &reg);
-       devid |= reg << 4;
-
-       ret = regmap_read(cs53l30->regmap, CS53L30_DEVID_E, &reg);
-       devid |= (reg & 0xF0) >> 4;
+       devid = cirrus_read_device_id(cs53l30->regmap, CS53L30_DEVID_AB);
+       if (devid < 0) {
+               ret = devid;
+               dev_err(dev, "Failed to read device ID: %d\n", ret);
+               goto error;
+       }
 
        if (devid != CS53L30_DEVID) {
                ret = -ENODEV;
@@ -1040,6 +1038,8 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
        return 0;
 
 error:
+       gpiod_set_value_cansleep(cs53l30->reset_gpio, 0);
+error_supplies:
        regulator_bulk_disable(ARRAY_SIZE(cs53l30->supplies),
                               cs53l30->supplies);
        return ret;