Skip to contentSkip to conversation

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

PATCH In review Axel Lin 3 participants 3 messages Jul 22, 2015 – Jul 30, 2015

Subsystems (3)
Sound ASoC Cirrus Logic audio codecs
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: cs4349: Remove unneeded NULL test for cs4349->reset_gpio

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

Signed-off-by Axel Lin <[email protected]>
---
 sound/soc/codecs/cs4349.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
sound/soc/codecs/cs4349.c +4 -8
index a7538ae..852be85 100644
@@ -300,8 +300,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
 	if (IS_ERR(cs4349->reset_gpio))
 		return PTR_ERR(cs4349->reset_gpio);
 
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
 
 	i2c_set_clientdata(client, cs4349);
 

@@ -316,8 +315,7 @@ static int cs4349_i2c_remove(struct i2c_client *client)
 	snd_soc_unregister_codec(&client->dev);
 
 	/* Hold down reset */
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
 
 	return 0;
 }

@@ -335,8 +333,7 @@ static int cs4349_runtime_suspend(struct device *dev)
 	regcache_cache_only(cs4349->regmap, true);
 
 	/* Hold down reset */
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
 
 	return 0;
 }

@@ -350,8 +347,7 @@ static int cs4349_runtime_resume(struct device *dev)
 	if (ret < 0)
 		return ret;
 
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
 
 	regcache_cache_only(cs4349->regmap, false);
 	regcache_sync(cs4349->regmap);
Signature · 1 line
2.1.0
maintainer
#1 lore raw

Applied "ASoC: cs4349: Remove unneeded NULL test for cs4349->reset_gpio" to the asoc tree

The patch

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

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 6a75c0b62b0981c3a34d3336725b0840747e7680 Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Wed, 22 Jul 2015 09:59:47 +0800
Subject: [PATCH] ASoC: cs4349: Remove unneeded NULL test for
cs4349->reset_gpio

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

Signed-off-by Axel Lin <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/codecs/cs4349.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
sound/soc/codecs/cs4349.c +4 -8
index a7538aea7f99..852be858bb9f 100644
@@ -300,8 +300,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
 	if (IS_ERR(cs4349->reset_gpio))
 		return PTR_ERR(cs4349->reset_gpio);
 
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
 
 	i2c_set_clientdata(client, cs4349);
 

@@ -316,8 +315,7 @@ static int cs4349_i2c_remove(struct i2c_client *client)
 	snd_soc_unregister_codec(&client->dev);
 
 	/* Hold down reset */
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
 
 	return 0;
 }

@@ -335,8 +333,7 @@ static int cs4349_runtime_suspend(struct device *dev)
 	regcache_cache_only(cs4349->regmap, true);
 
 	/* Hold down reset */
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 0);
 
 	return 0;
 }

@@ -350,8 +347,7 @@ static int cs4349_runtime_resume(struct device *dev)
 	if (ret < 0)
 		return ret;
 
-	if (cs4349->reset_gpio)
-		gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
+	gpiod_set_value_cansleep(cs4349->reset_gpio, 1);
 
 	regcache_cache_only(cs4349->regmap, false);
 	regcache_sync(cs4349->regmap);
Signature · 1 line
2.1.4