Applied "ASoC: wm8804: Remove unneeded gpiod NULL check" to the asoc tree

Message ID E1dX8X3-0004yd-On@debutante
State New
Headers show

Commit Message

Mark Brown July 17, 2017, 4:06 p.m.
The patch

   ASoC: wm8804: Remove unneeded gpiod NULL check

has been applied to the asoc tree at


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.


From 89b13706c4bb6dae0263014051dd59986376faa5 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <>

Date: Sun, 16 Jul 2017 18:11:07 -0300
Subject: [PATCH] ASoC: wm8804: 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 <>

Signed-off-by: Mark Brown <>

 sound/soc/codecs/wm8804.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index af95d648265b..fc69b87443d8 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -623,8 +623,7 @@  int wm8804_probe(struct device *dev, struct regmap *regmap)
 		return ret;
-	if (wm8804->reset)
-		gpiod_set_value_cansleep(wm8804->reset, 1);
+	gpiod_set_value_cansleep(wm8804->reset, 1);
 	ret = regmap_read(regmap, WM8804_RST_DEVID1, &id1);
 	if (ret < 0) {