forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: bf5xx-ac97: Convert to devm_gpio_request_one()

Browse source 
Also clean up the error reporting from failed requests while we're at it.

Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Mark Brown 2013-06-26 11:47:56 +01:00
commit 6dab2fd71c
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/blackfin/bf5xx-ac97.c
View file

@ -293,13 +293,14 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
/* Request PB3 as reset pin */ /* Request PB3 as reset pin */
if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, "SND_AD198x RESET")) { ret = devm_gpio_request_one(&pdev->dev,
pr_err("Failed to request GPIO_%d for reset\n", CONFIG_SND_BF5XX_RESET_GPIO_NUM,
CONFIG_SND_BF5XX_RESET_GPIO_NUM); GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") {
ret = -1; dev_err(&pdev->dev,
"Failed to request GPIO_%d for reset: %d\n",
CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret);
goto gpio_err; goto gpio_err;
} }
gpio_direction_output(CONFIG_SND_BF5XX_RESET_GPIO_NUM, 1);
#endif #endif
sport_handle = sport_init(pdev, 2, sizeof(struct ac97_frame), sport_handle = sport_init(pdev, 2, sizeof(struct ac97_frame),
@ -349,10 +350,6 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
sport_config_err: sport_config_err:
sport_done(sport_handle); sport_done(sport_handle);
sport_err: sport_err:
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
gpio_err:
#endif
return ret; return ret;
} }
@ -363,9 +360,6 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev)
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
sport_done(sport_handle); sport_done(sport_handle);
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
#endif
return 0; return 0;
} }