]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: cs35l33: Remove unneeded gpiod NULL check
authorFabio Estevam <fabio.estevam@nxp.com>
Sun, 16 Jul 2017 21:11:09 +0000 (18:11 -0300)
committerMark Brown <broonie@kernel.org>
Mon, 17 Jul 2017 14:42:31 +0000 (15:42 +0100)
The gpiod API checks for NULL descriptors, so there is no need to
duplicate the check in the driver.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs35l33.c

index 6df29fa30fb9d8d17216026b925fb8df1ba7dc3c..1eea91271ebb245a9e77d6848e4814e37d7a2a67 100644 (file)
@@ -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,