Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc...
[muen/linux.git] / sound / soc / codecs / cs35l34.c
index 0a747c66cc6ccc593036775f51ae4eaa050cc850..1e05026bedcadeb422c3f6069db0a0d5e9a83e1f 100644 (file)
@@ -779,7 +779,7 @@ static int cs35l34_probe(struct snd_soc_codec *codec)
 }
 
 
-static struct snd_soc_codec_driver soc_codec_dev_cs35l34 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs35l34 = {
        .probe = cs35l34_probe,
 
        .component_driver = {
@@ -1138,8 +1138,7 @@ static int cs35l34_i2c_remove(struct i2c_client *client)
 
        snd_soc_unregister_codec(&client->dev);
 
-       if (cs35l34->reset_gpio)
-               gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
+       gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
 
        pm_runtime_disable(&client->dev);
        regulator_bulk_disable(cs35l34->num_core_supplies,