diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 14:00:47 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 14:00:47 -0500 |
commit | 5220ed6b321639d68a66bad2082456c1b273f3ea (patch) | |
tree | 660e4231d24eb73ba487e5f8431bed8b7fb93c16 /sound/soc | |
parent | 0bc286e2ac72e483d2b5a6dac0dafb05e9f047c8 (diff) |
ALSA: ASoC: Fix compile warnings on corgi.c
Fix the wrong shutdown callback type. Also removed the unused variables
there:
sound/soc/pxa/corgi.c: In function 'corgi_shutdown':
sound/soc/pxa/corgi.c:114: warning: unused variable 'codec'
sound/soc/pxa/corgi.c: At top level:
sound/soc/pxa/corgi.c:175: warning: initialization from incompatible pointer type
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/pxa/corgi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 647f056a3cb3..e56bf4b6c2af 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -108,15 +108,11 @@ static int corgi_startup(struct snd_pcm_substream *substream) | |||
108 | } | 108 | } |
109 | 109 | ||
110 | /* we need to unmute the HP at shutdown as the mute burns power on corgi */ | 110 | /* we need to unmute the HP at shutdown as the mute burns power on corgi */ |
111 | static int corgi_shutdown(struct snd_pcm_substream *substream) | 111 | static void corgi_shutdown(struct snd_pcm_substream *substream) |
112 | { | 112 | { |
113 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
114 | struct snd_soc_codec *codec = rtd->socdev->codec; | ||
115 | |||
116 | /* set = unmute headphone */ | 113 | /* set = unmute headphone */ |
117 | gpio_set_value(CORGI_GPIO_MUTE_L, 1); | 114 | gpio_set_value(CORGI_GPIO_MUTE_L, 1); |
118 | gpio_set_value(CORGI_GPIO_MUTE_R, 1); | 115 | gpio_set_value(CORGI_GPIO_MUTE_R, 1); |
119 | return 0; | ||
120 | } | 116 | } |
121 | 117 | ||
122 | static int corgi_hw_params(struct snd_pcm_substream *substream, | 118 | static int corgi_hw_params(struct snd_pcm_substream *substream, |