Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc...
[muen/linux.git] / sound / soc / codecs / cs35l33.c
index 6df29fa30fb9d8d17216026b925fb8df1ba7dc3c..854cf8f27605a87c97bc2e93a530bcd4a9ce5108 100644 (file)
@@ -831,7 +831,7 @@ static int cs35l33_probe(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_cs35l33 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs35l33 = {
        .probe = cs35l33_probe,
 
        .set_bias_level = cs35l33_set_bias_level,
@@ -869,8 +869,7 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
 
        dev_dbg(dev, "%s\n", __func__);
 
-       if (cs35l33->reset_gpio)
-               gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
 
        ret = regulator_bulk_enable(cs35l33->num_core_supplies,
                cs35l33->core_supplies);
@@ -881,8 +880,7 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
 
        regcache_cache_only(cs35l33->regmap, false);
 
-       if (cs35l33->reset_gpio)
-               gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
 
        msleep(CS35L33_BOOT_DELAY);
 
@@ -1191,8 +1189,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
                return ret;
        }
 
-       if (cs35l33->reset_gpio)
-               gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
 
        msleep(CS35L33_BOOT_DELAY);
        regcache_cache_only(cs35l33->regmap, false);
@@ -1262,8 +1259,7 @@ static int cs35l33_i2c_remove(struct i2c_client *client)
 
        snd_soc_unregister_codec(&client->dev);
 
-       if (cs35l33->reset_gpio)
-               gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
 
        pm_runtime_disable(&client->dev);
        regulator_bulk_disable(cs35l33->num_core_supplies,