Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/arizona', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / adau1977.c

diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c
index 3292816757656c1919c5c88cdeba6673fed59099..e384f212beb2cc7cd90320952e1dda41c5064d1a 100644 (file)
--- a/sound/soc/codecs/adau1977.c
+++ b/sound/soc/codecs/adau1977.c
@@ -388,8 +388,7 @@ static int adau1977_power_disable(struct adau1977 *adau1977)
 
        regcache_mark_dirty(adau1977->regmap);
 
-       if (adau1977->reset_gpio)
-               gpiod_set_value_cansleep(adau1977->reset_gpio, 0);
+       gpiod_set_value_cansleep(adau1977->reset_gpio, 0);
 
        regcache_cache_only(adau1977->regmap, true);
 
@@ -420,8 +419,7 @@ static int adau1977_power_enable(struct adau1977 *adau1977)
                        goto err_disable_avdd;
        }
 
-       if (adau1977->reset_gpio)
-               gpiod_set_value_cansleep(adau1977->reset_gpio, 1);
+       gpiod_set_value_cansleep(adau1977->reset_gpio, 1);
 
        regcache_cache_only(adau1977->regmap, false);