Commit 877db3c1 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Takashi Iwai
Browse files

ALSA: ASoC: Update Poodle to current ASoC API 



Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent be41e941

sound/soc/pxa/poodle.c

+2 −6
Original line number Diff line number Diff line
@@ -85,17 +85,13 @@ static int poodle_startup(struct snd_pcm_substream *substream) 
}



/* we need to unmute the HP at shutdown as the mute burns power on poodle */

static int poodle_shutdown(struct snd_pcm_substream *substream)

static void poodle_shutdown(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec *codec = rtd->socdev->codec;



	/* set = unmute headphone */

	locomo_gpio_write(&poodle_locomo_device.dev,

		POODLE_LOCOMO_GPIO_MUTE_L, 1);

	locomo_gpio_write(&poodle_locomo_device.dev,

		POODLE_LOCOMO_GPIO_MUTE_R, 1);

	return 0;

}



static int poodle_hw_params(struct snd_pcm_substream *substream,
@@ -232,7 +228,7 @@ static const struct soc_enum poodle_enum[] = { 
	SOC_ENUM_SINGLE_EXT(2, spk_function),

};



static const snd_kcontrol_new_t wm8731_poodle_controls[] = {

static const struct snd_kcontrol_new wm8731_poodle_controls[] = {

	SOC_ENUM_EXT("Jack Function", poodle_enum[0], poodle_get_jack,

		poodle_set_jack),

	SOC_ENUM_EXT("Speaker Function", poodle_enum[1], poodle_get_spk,