diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-07 10:03:12 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-08 00:14:19 +0800 |
| commit | 209e8cf668d3f421eb6d86eb62451396fb0a737d (patch) | |
| tree | d96b2b4b7809fe2eddc8a7778df1164207f6499a /sound/soc/pxa | |
| parent | 8faab941bec7af1c1865db316ac2f37c78071271 (diff) | |
| download | linux-3.10-209e8cf668d3f421eb6d86eb62451396fb0a737d.tar.gz linux-3.10-209e8cf668d3f421eb6d86eb62451396fb0a737d.tar.bz2 linux-3.10-209e8cf668d3f421eb6d86eb62451396fb0a737d.zip | |
ASoC: Convert e800_wm9712 to use gpio_request_one()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 26e02322f10..478ff191ffb 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -119,22 +119,16 @@ static int __init e800_init(void) if (!machine_is_e800()) return -ENODEV; - ret = gpio_request(GPIO_E800_HP_AMP_OFF, "Headphone amp"); + ret = gpio_request_one(GPIO_E800_HP_AMP_OFF, GPIOF_OUT_INIT_HIGH, + "Headphone amp"); if (ret) return ret; - ret = gpio_request(GPIO_E800_SPK_AMP_ON, "Speaker amp"); + ret = gpio_request_one(GPIO_E800_SPK_AMP_ON, GPIOF_OUT_INIT_HIGH, + "Speaker amp"); if (ret) goto free_hp_amp_gpio; - ret = gpio_direction_output(GPIO_E800_HP_AMP_OFF, 1); - if (ret) - goto free_spk_amp_gpio; - - ret = gpio_direction_output(GPIO_E800_SPK_AMP_ON, 1); - if (ret) - goto free_spk_amp_gpio; - e800_snd_device = platform_device_alloc("soc-audio", -1); if (!e800_snd_device) { ret = -ENOMEM; |