Skip to content

Commit

Permalink
ASoC: sta32x: Use devm_gpiod_get_optional at appropriate place
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed May 12, 2015
1 parent b787f68 commit 79ffbf1
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions sound/soc/codecs/sta32x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1096,16 +1096,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++)
Expand Down

0 comments on commit 79ffbf1

Please sign in to comment.