lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: JZ4740: qi_lb60: Use gpio_request_array to request and setup gpios

Browse Source 
This patch changes the qi_lb60 setup code to use gpio_request_array instead of
manually calling gpio_request and gpio_direction_output for each gpio.
Doing so makes the code a bit more compact.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lars-Peter Clausen 2011-04-12 19:31:04 +02:00 committed by Mark Brown
parent 1331969911
commit c6f0ede7c5
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/jz4740/qi_lb60.c
View File

@ -96,6 +96,11 @@ static struct snd_soc_card qi_lb60 = {
static struct platform_device *qi_lb60_snd_device; static struct platform_device *qi_lb60_snd_device;
static const struct gpio qi_lb60_gpios[] = {
{ QI_LB60_SND_GPIO, GPIOF_OUT_INIT_LOW, "SND" },
{ QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
};
static int __init qi_lb60_init(void) static int __init qi_lb60_init(void)
{ {
int ret; int ret;
@ -105,23 +110,12 @@ static int __init qi_lb60_init(void)
if (!qi_lb60_snd_device) if (!qi_lb60_snd_device)
return -ENOMEM; return -ENOMEM;
ret = gpio_request(QI_LB60_SND_GPIO, "SND"); ret = gpio_request_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
if (ret) { if (ret) {
pr_err("qi_lb60 snd: Failed to request SND GPIO(%d): %d\n", pr_err("qi_lb60 snd: Failed to request gpios: %d\n", ret);
QI_LB60_SND_GPIO, ret);
goto err_device_put; goto err_device_put;
} }
ret = gpio_request(QI_LB60_AMP_GPIO, "AMP");
if (ret) {
pr_err("qi_lb60 snd: Failed to request AMP GPIO(%d): %d\n",
QI_LB60_AMP_GPIO, ret);
goto err_gpio_free_snd;
}
gpio_direction_output(QI_LB60_SND_GPIO, 0);
gpio_direction_output(QI_LB60_AMP_GPIO, 0);
platform_set_drvdata(qi_lb60_snd_device, &qi_lb60); platform_set_drvdata(qi_lb60_snd_device, &qi_lb60);
ret = platform_device_add(qi_lb60_snd_device); ret = platform_device_add(qi_lb60_snd_device);
@ -134,10 +128,8 @@ static int __init qi_lb60_init(void)
err_unset_pdata: err_unset_pdata:
platform_set_drvdata(qi_lb60_snd_device, NULL); platform_set_drvdata(qi_lb60_snd_device, NULL);
/*err_gpio_free_amp:*/ /*err_gpio_free_array:*/
gpio_free(QI_LB60_AMP_GPIO); gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
err_gpio_free_snd:
gpio_free(QI_LB60_SND_GPIO);
err_device_put: err_device_put:
platform_device_put(qi_lb60_snd_device); platform_device_put(qi_lb60_snd_device);
@ -147,9 +139,8 @@ module_init(qi_lb60_init);
static void __exit qi_lb60_exit(void) static void __exit qi_lb60_exit(void)
{ {
gpio_free(QI_LB60_AMP_GPIO);
gpio_free(QI_LB60_SND_GPIO);
platform_device_unregister(qi_lb60_snd_device); platform_device_unregister(qi_lb60_snd_device);
gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
} }
module_exit(qi_lb60_exit); module_exit(qi_lb60_exit);