From 8a371840f825be20354007537b6568b77448b685 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 20 Feb 2007 15:44:23 +0000 Subject: [ARM] Fix ARM AACI ALSA driver CC [M] sound/arm/aaci.o sound/arm/aaci.c:729: error: parse error before '*' token sound/arm/aaci.c:731: warning: function declaration isn't a prototype ... sound/arm/aaci.c:786: error: parse error before '*' token sound/arm/aaci.c:786: warning: function declaration isn't a prototype ... sound/arm/aaci.c:827: error: parse error before '*' token sound/arm/aaci.c:828: warning: function declaration isn't a prototype ... sound/arm/aaci.c:845: error: parse error before "aaci_capture_ops" sound/arm/aaci.c:845: warning: type defaults to `int' in declaration of `aaci_capture_ops' Signed-off-by: Russell King --- sound/arm/aaci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sound') diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 5190d7acdb9f..b9eca9f3dd25 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -726,8 +726,8 @@ static struct snd_pcm_ops aaci_playback_ops = { .mmap = aaci_pcm_mmap, }; -static int aaci_pcm_capture_hw_params(snd_pcm_substream_t *substream, - snd_pcm_hw_params_t *params) +static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) { struct aaci *aaci = substream->private_data; struct aaci_runtime *aacirun = substream->runtime->private_data; @@ -783,8 +783,8 @@ static void aaci_pcm_capture_start(struct aaci_runtime *aacirun) writel(ie, aacirun->base + AACI_IE); } -static int aaci_pcm_capture_trigger(snd_pcm_substream_t *substream, int cmd){ - +static int aaci_pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd) +{ struct aaci *aaci = substream->private_data; struct aaci_runtime *aacirun = substream->runtime->private_data; unsigned long flags; @@ -824,7 +824,7 @@ static int aaci_pcm_capture_trigger(snd_pcm_substream_t *substream, int cmd){ return ret; } -static int aaci_pcm_capture_prepare(snd_pcm_substream_t *substream) +static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct aaci *aaci = substream->private_data; @@ -842,7 +842,7 @@ static int aaci_pcm_capture_prepare(snd_pcm_substream_t *substream) return 0; } -static snd_pcm_ops_t aaci_capture_ops = { +static struct snd_pcm_ops aaci_capture_ops = { .open = aaci_pcm_open, .close = aaci_pcm_close, .ioctl = snd_pcm_lib_ioctl, -- cgit v1.2.3