aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2017-07-16 17:11:12 -0400
committerMark Brown <broonie@kernel.org>2017-07-17 10:43:38 -0400
commit55be663dc71ec50f0e383c50886cbd3be69fcd2e (patch)
treead6e4d9a568045122d4518cdb5f8b5619cd1a681
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
ASoC: cs53l30: Remove unneeded gpiod NULL check
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>
-rw-r--r--sound/soc/codecs/cs53l30.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 06933a5d0a75..92fbe6303dd4 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -842,8 +842,7 @@ static int cs53l30_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
842{ 842{
843 struct cs53l30_private *priv = snd_soc_codec_get_drvdata(dai->codec); 843 struct cs53l30_private *priv = snd_soc_codec_get_drvdata(dai->codec);
844 844
845 if (priv->mute_gpio) 845 gpiod_set_value_cansleep(priv->mute_gpio, mute);
846 gpiod_set_value_cansleep(priv->mute_gpio, mute);
847 846
848 return 0; 847 return 0;
849} 848}
@@ -960,8 +959,7 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
960 goto error; 959 goto error;
961 } 960 }
962 961
963 if (cs53l30->reset_gpio) 962 gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
964 gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
965 963
966 i2c_set_clientdata(client, cs53l30); 964 i2c_set_clientdata(client, cs53l30);
967 965
@@ -1056,8 +1054,7 @@ static int cs53l30_i2c_remove(struct i2c_client *client)
1056 snd_soc_unregister_codec(&client->dev); 1054 snd_soc_unregister_codec(&client->dev);
1057 1055
1058 /* Hold down reset */ 1056 /* Hold down reset */
1059 if (cs53l30->reset_gpio) 1057 gpiod_set_value_cansleep(cs53l30->reset_gpio, 0);
1060 gpiod_set_value_cansleep(cs53l30->reset_gpio, 0);
1061 1058
1062 regulator_bulk_disable(ARRAY_SIZE(cs53l30->supplies), 1059 regulator_bulk_disable(ARRAY_SIZE(cs53l30->supplies),
1063 cs53l30->supplies); 1060 cs53l30->supplies);
@@ -1073,8 +1070,7 @@ static int cs53l30_runtime_suspend(struct device *dev)
1073 regcache_cache_only(cs53l30->regmap, true); 1070 regcache_cache_only(cs53l30->regmap, true);
1074 1071
1075 /* Hold down reset */ 1072 /* Hold down reset */
1076 if (cs53l30->reset_gpio) 1073 gpiod_set_value_cansleep(cs53l30->reset_gpio, 0);
1077 gpiod_set_value_cansleep(cs53l30->reset_gpio, 0);
1078 1074
1079 regulator_bulk_disable(ARRAY_SIZE(cs53l30->supplies), 1075 regulator_bulk_disable(ARRAY_SIZE(cs53l30->supplies),
1080 cs53l30->supplies); 1076 cs53l30->supplies);
@@ -1094,8 +1090,7 @@ static int cs53l30_runtime_resume(struct device *dev)
1094 return ret; 1090 return ret;
1095 } 1091 }
1096 1092
1097 if (cs53l30->reset_gpio) 1093 gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
1098 gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
1099 1094
1100 regcache_cache_only(cs53l30->regmap, false); 1095 regcache_cache_only(cs53l30->regmap, false);
1101 ret = regcache_sync(cs53l30->regmap); 1096 ret = regcache_sync(cs53l30->regmap);