ASoC: Convert e750_wm9705 to use gpio_request_one()

[mv-sheeva.git] / sound / soc / pxa / e750_wm9705.c

diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index ce5f056009a7d5770ae85d4bce9bfff73eb538b7..55c53d13bea63a5f2cd6bc5380c0c6366d153e32 100644 (file)
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -129,22 +129,16 @@ static int __init e750_init(void)
        if (!machine_is_e750())
                return -ENODEV;
 
-       ret = gpio_request(GPIO_E750_HP_AMP_OFF,  "Headphone amp");
+       ret = gpio_request_one(GPIO_E750_HP_AMP_OFF, GPIOF_OUT_INIT_HIGH,
+                              "Headphone amp");
        if (ret)
                return ret;
 
-       ret = gpio_request(GPIO_E750_SPK_AMP_OFF, "Speaker amp");
+       ret = gpio_request_one(GPIO_E750_SPK_AMP_OFF, GPIOF_OUT_INIT_HIGH,
+                              "Speaker amp");
        if (ret)
                goto free_hp_amp_gpio;
 
-       ret = gpio_direction_output(GPIO_E750_HP_AMP_OFF, 1);
-       if (ret)
-               goto free_spk_amp_gpio;
-
-       ret = gpio_direction_output(GPIO_E750_SPK_AMP_OFF, 1);
-       if (ret)
-               goto free_spk_amp_gpio;
-
        e750_snd_device = platform_device_alloc("soc-audio", -1);
        if (!e750_snd_device) {
                ret = -ENOMEM;