| Message ID | 1433947565.19912.1.camel@ingics.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8604bc28365c0673d932b0bfa6e52abb5d4dd62c |
| Headers | show |
On 06/10/2015 05:46 PM, Axel Lin wrote: > commit ea178d1456dc ("ASoC: tas2552: Make the enable-gpio really optional") > makes enable-gpio optional. devm_gpiod_get_optional() is the better > function for optional gpio, so let's switch to use it. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > sound/soc/codecs/tas2552.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c > index 169a703..4f25a7d 100644 > --- a/sound/soc/codecs/tas2552.c > +++ b/sound/soc/codecs/tas2552.c > @@ -703,13 +703,10 @@ static int tas2552_probe(struct i2c_client *client, > if (data == NULL) > return -ENOMEM; > > - data->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); > - if (IS_ERR(data->enable_gpio)) { > - if (PTR_ERR(data->enable_gpio) == -EPROBE_DEFER) > - return -EPROBE_DEFER; > - > - data->enable_gpio = NULL; > - } > + data->enable_gpio = devm_gpiod_get_optional(dev, "enable", > + GPIOD_OUT_LOW); > + if (IS_ERR(data->enable_gpio)) > + return PTR_ERR(data->enable_gpio); > > data->tas2552_client = client; > data->regmap = devm_regmap_init_i2c(client, &tas2552_regmap_config); >
On Wed, Jun 10, 2015 at 10:46:05PM +0800, Axel Lin wrote: > commit ea178d1456dc ("ASoC: tas2552: Make the enable-gpio really optional") > makes enable-gpio optional. devm_gpiod_get_optional() is the better > function for optional gpio, so let's switch to use it. Applied, thanks.
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index 169a703..4f25a7d 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -703,13 +703,10 @@ static int tas2552_probe(struct i2c_client *client, if (data == NULL) return -ENOMEM; - data->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); - if (IS_ERR(data->enable_gpio)) { - if (PTR_ERR(data->enable_gpio) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - data->enable_gpio = NULL; - } + data->enable_gpio = devm_gpiod_get_optional(dev, "enable", + GPIOD_OUT_LOW); + if (IS_ERR(data->enable_gpio)) + return PTR_ERR(data->enable_gpio); data->tas2552_client = client; data->regmap = devm_regmap_init_i2c(client, &tas2552_regmap_config);
commit ea178d1456dc ("ASoC: tas2552: Make the enable-gpio really optional") makes enable-gpio optional. devm_gpiod_get_optional() is the better function for optional gpio, so let's switch to use it. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- sound/soc/codecs/tas2552.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)