leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: cs35l32: Remove unneeded NULL test for cs35l32->reset_gpio

Browse Source 
It's safe to call gpiod_set_value_cansleep() with NULL desc.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2015-07-23 08:29:57 +08:00 committed by Mark Brown
parent 4c38b9c30f
commit d5a78c8ea0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/cs35l32.c
View File

@ -441,8 +441,7 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
if (IS_ERR(cs35l32->reset_gpio)) if (IS_ERR(cs35l32->reset_gpio))
return PTR_ERR(cs35l32->reset_gpio); return PTR_ERR(cs35l32->reset_gpio);
if (cs35l32->reset_gpio) gpiod_set_value_cansleep(cs35l32->reset_gpio, 1);
gpiod_set_value_cansleep(cs35l32->reset_gpio, 1);
/* initialize codec */ /* initialize codec */
ret = regmap_read(cs35l32->regmap, CS35L32_DEVID_AB, &reg); ret = regmap_read(cs35l32->regmap, CS35L32_DEVID_AB, &reg);
@ -536,8 +535,7 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client)
snd_soc_unregister_codec(&i2c_client->dev); snd_soc_unregister_codec(&i2c_client->dev);
/* Hold down reset */ /* Hold down reset */
if (cs35l32->reset_gpio) gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);
gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);
return 0; return 0;
} }
@ -551,8 +549,7 @@ static int cs35l32_runtime_suspend(struct device *dev)
regcache_mark_dirty(cs35l32->regmap); regcache_mark_dirty(cs35l32->regmap);
/* Hold down reset */ /* Hold down reset */
if (cs35l32->reset_gpio) gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);
gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);
/* remove power */ /* remove power */
regulator_bulk_disable(ARRAY_SIZE(cs35l32->supplies), regulator_bulk_disable(ARRAY_SIZE(cs35l32->supplies),
@ -575,8 +572,7 @@ static int cs35l32_runtime_resume(struct device *dev)
return ret; return ret;
} }
if (cs35l32->reset_gpio) gpiod_set_value_cansleep(cs35l32->reset_gpio, 1);
gpiod_set_value_cansleep(cs35l32->reset_gpio, 1);
regcache_cache_only(cs35l32->regmap, false); regcache_cache_only(cs35l32->regmap, false);
regcache_sync(cs35l32->regmap); regcache_sync(cs35l32->regmap);