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>

diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 26e02322f10b727849885e458150ddc5f27ec4ed..478ff191ffb4ad20e8daf18b5a35fc750310387c 100644 (file)
--- 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;