[v2,1/2] ASoC: sta32x: Use devm_gpiod_get_optional at appropriate place
diff mbox

Message ID 1431184113.5393.1.camel@ingics.com
State New
Headers show

Commit Message

Axel Lin May 9, 2015, 3:08 p.m. UTC
devm_gpiod_get_optional() is equivalent to devm_gpiod_get(), except that
when no GPIO was assigned to the requested function it will return NULL.
This is convenient for drivers that need to handle optional GPIOs.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: Fixup subject line
 sound/soc/codecs/sta32x.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Comments

Mark Brown May 12, 2015, 5:52 p.m. UTC | #1
On Sat, May 09, 2015 at 11:08:33PM +0800, Axel Lin wrote:
> devm_gpiod_get_optional() is equivalent to devm_gpiod_get(), except that
> when no GPIO was assigned to the requested function it will return NULL.
> This is convenient for drivers that need to handle optional GPIOs.

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 033b7d9..847fb20 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -1095,16 +1095,10 @@  static int sta32x_i2c_probe(struct i2c_client *i2c,
 #endif
 
 	/* GPIOs */
-	sta32x->gpiod_nreset = devm_gpiod_get(dev, "reset");
-	if (IS_ERR(sta32x->gpiod_nreset)) {
-		ret = PTR_ERR(sta32x->gpiod_nreset);
-		if (ret != -ENOENT && ret != -ENOSYS)
-			return ret;
-
-		sta32x->gpiod_nreset = NULL;
-	} else {
-		gpiod_direction_output(sta32x->gpiod_nreset, 0);
-	}
+	sta32x->gpiod_nreset = devm_gpiod_get_optional(dev, "reset",
+						       GPIOD_OUT_LOW);
+	if (IS_ERR(sta32x->gpiod_nreset))
+		return PTR_ERR(sta32x->gpiod_nreset);
 
 	/* regulators */
 	for (i = 0; i < ARRAY_SIZE(sta32x->supplies); i++)