dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

ASoC: uda1380: Convert to gpio_request_one()

Browse source 
Using gpio_request_one can make the error handling simpler.

Also remove a redundant "Failed to issue reset" error message.
We already show the error message in uda1380_reset() error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-05 07:58:25 +08:00 committed by Mark Brown
parent aec60f51e5
commit 68020db8ac
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sound/soc/codecs/uda1380.c
View file

@ -732,27 +732,21 @@ static int uda1380_probe(struct snd_soc_codec *codec)
return -EINVAL; return -EINVAL;
if (gpio_is_valid(pdata->gpio_reset)) { if (gpio_is_valid(pdata->gpio_reset)) {
ret = gpio_request(pdata->gpio_reset, "uda1380 reset"); ret = gpio_request_one(pdata->gpio_reset, GPIOF_OUT_INIT_LOW,
"uda1380 reset");
if (ret) if (ret)
goto err_out; goto err_out;
ret = gpio_direction_output(pdata->gpio_reset, 0);
if (ret)
goto err_gpio_reset_conf;
} }
if (gpio_is_valid(pdata->gpio_power)) { if (gpio_is_valid(pdata->gpio_power)) {
ret = gpio_request(pdata->gpio_power, "uda1380 power"); ret = gpio_request_one(pdata->gpio_power, GPIOF_OUT_INIT_LOW,
"uda1380 power");
if (ret) if (ret)
goto err_gpio; goto err_free_gpio;
ret = gpio_direction_output(pdata->gpio_power, 0);
if (ret)
goto err_gpio_power_conf;
} else { } else {
ret = uda1380_reset(codec); ret = uda1380_reset(codec);
if (ret) { if (ret)
dev_err(codec->dev, "Failed to issue reset\n"); goto err_free_gpio;
goto err_reset;
}
} }
INIT_WORK(&uda1380->work, uda1380_flush_work); INIT_WORK(&uda1380->work, uda1380_flush_work);
@ -776,13 +770,7 @@ static int uda1380_probe(struct snd_soc_codec *codec)
return 0; return 0;
err_reset: err_free_gpio:
err_gpio_power_conf:
if (gpio_is_valid(pdata->gpio_power))
gpio_free(pdata->gpio_power);
err_gpio_reset_conf:
err_gpio:
if (gpio_is_valid(pdata->gpio_reset)) if (gpio_is_valid(pdata->gpio_reset))
gpio_free(pdata->gpio_reset); gpio_free(pdata->gpio_reset);
err_out: err_out: