aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/s3c2443-ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-04-30 11:19:07 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-30 13:37:47 -0400
commitccfdd6c2b2ad3f32c02175007a66c82e2233b75c (patch)
tree5c09337136b198c947fa4d948e9bb9b0c4e5401c /sound/soc/s3c24xx/s3c2443-ac97.c
parent60fc684adfed810fc36b41778aca8de467fc3206 (diff)
[ALSA] soc - s3c2443-ac97 - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/s3c24xx/s3c2443-ac97.c')
-rw-r--r--sound/soc/s3c24xx/s3c2443-ac97.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 1c1ddbf7f3c0..e81d9a6c83da 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -19,6 +19,7 @@
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/platform_device.h> 20#include <linux/platform_device.h>
21#include <linux/interrupt.h> 21#include <linux/interrupt.h>
22#include <linux/io.h>
22#include <linux/wait.h> 23#include <linux/wait.h>
23#include <linux/delay.h> 24#include <linux/delay.h>
24#include <linux/clk.h> 25#include <linux/clk.h>
@@ -30,7 +31,6 @@
30#include <sound/soc.h> 31#include <sound/soc.h>
31 32
32#include <asm/hardware.h> 33#include <asm/hardware.h>
33#include <asm/io.h>
34#include <asm/plat-s3c/regs-ac97.h> 34#include <asm/plat-s3c/regs-ac97.h>
35#include <asm/arch/regs-gpio.h> 35#include <asm/arch/regs-gpio.h>
36#include <asm/arch/regs-clock.h> 36#include <asm/arch/regs-clock.h>
@@ -47,7 +47,7 @@ struct s3c24xx_ac97_info {
47}; 47};
48static struct s3c24xx_ac97_info s3c24xx_ac97; 48static struct s3c24xx_ac97_info s3c24xx_ac97;
49 49
50DECLARE_COMPLETION(ac97_completion); 50static DECLARE_COMPLETION(ac97_completion);
51static u32 codec_ready; 51static u32 codec_ready;
52static DECLARE_MUTEX(ac97_mutex); 52static DECLARE_MUTEX(ac97_mutex);
53 53
@@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd)
290 u32 ac_glbctrl; 290 u32 ac_glbctrl;
291 291
292 ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); 292 ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL);
293 switch(cmd) { 293 switch (cmd) {
294 case SNDRV_PCM_TRIGGER_START: 294 case SNDRV_PCM_TRIGGER_START:
295 case SNDRV_PCM_TRIGGER_RESUME: 295 case SNDRV_PCM_TRIGGER_RESUME:
296 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 296 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@@ -333,7 +333,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream,
333 u32 ac_glbctrl; 333 u32 ac_glbctrl;
334 334
335 ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); 335 ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL);
336 switch(cmd) { 336 switch (cmd) {
337 case SNDRV_PCM_TRIGGER_START: 337 case SNDRV_PCM_TRIGGER_START:
338 case SNDRV_PCM_TRIGGER_RESUME: 338 case SNDRV_PCM_TRIGGER_RESUME:
339 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 339 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@@ -391,7 +391,6 @@ struct snd_soc_cpu_dai s3c2443_ac97_dai[] = {
391 .trigger = s3c2443_ac97_mic_trigger,}, 391 .trigger = s3c2443_ac97_mic_trigger,},
392}, 392},
393}; 393};
394
395EXPORT_SYMBOL_GPL(s3c2443_ac97_dai); 394EXPORT_SYMBOL_GPL(s3c2443_ac97_dai);
396EXPORT_SYMBOL_GPL(soc_ac97_ops); 395EXPORT_SYMBOL_GPL(soc_ac97_ops);
397 396