Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 209e8cf6 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Convert e800_wm9712 to use gpio_request_one() 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8faab941

sound/soc/pxa/e800_wm9712.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -119,22 +119,16 @@ static int __init e800_init(void) 
	if (!machine_is_e800())

	if (!machine_is_e800())

		return -ENODEV;

		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)

	if (ret)

		return 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)

	if (ret)

		goto free_hp_amp_gpio;

		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);

	e800_snd_device = platform_device_alloc("soc-audio", -1);

	if (!e800_snd_device) {

	if (!e800_snd_device) {

		ret = -ENOMEM;

		ret = -ENOMEM;