aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAdam M. Dutko <dutko.adam@gmail.com>2011-06-23 10:57:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:55:55 -0400
commit37f9619dd5df9f1c9878ac53e27033519b8760ec (patch)
tree8d2e35c0f1c154ef4cc0c438d93eb305275436a3 /drivers/staging
parent51b6d717fb8e261e9705d66351f425561f114d4b (diff)
[media] TM6000: alsa: Clean up kernel coding style errors
There were several coding style errors as reported by checkpatch.pl. This patch should fix those errors with the single exception of the open square bracket issue on line 45. [mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Adam M. Dutko <dutko.adam@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/tm6000/tm6000-alsa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index a588f299af4..018ff73ab71 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -18,7 +18,7 @@
18#include <linux/slab.h> 18#include <linux/slab.h>
19#include <linux/vmalloc.h> 19#include <linux/vmalloc.h>
20 20
21#include <asm/delay.h> 21#include <linux/delay.h>
22#include <sound/core.h> 22#include <sound/core.h>
23#include <sound/pcm.h> 23#include <sound/pcm.h>
24#include <sound/pcm_params.h> 24#include <sound/pcm_params.h>
@@ -84,7 +84,6 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip)
84 84
85 tm6000_set_audio_bitrate(core, 48000); 85 tm6000_set_audio_bitrate(core, 48000);
86 86
87
88 return 0; 87 return 0;
89} 88}
90 89
@@ -123,6 +122,7 @@ static int dsp_buffer_alloc(struct snd_pcm_substream *substream, int size)
123 if (substream->runtime->dma_area) { 122 if (substream->runtime->dma_area) {
124 if (substream->runtime->dma_bytes > size) 123 if (substream->runtime->dma_bytes > size)
125 return 0; 124 return 0;
125
126 dsp_buffer_free(substream); 126 dsp_buffer_free(substream);
127 } 127 }
128 128
@@ -152,9 +152,9 @@ static struct snd_pcm_hardware snd_tm6000_digital_hw = {
152 SNDRV_PCM_INFO_MMAP_VALID, 152 SNDRV_PCM_INFO_MMAP_VALID,
153 .formats = SNDRV_PCM_FMTBIT_S16_LE, 153 .formats = SNDRV_PCM_FMTBIT_S16_LE,
154 154
155 .rates = SNDRV_PCM_RATE_CONTINUOUS, 155 .rates = SNDRV_PCM_RATE_CONTINUOUS,
156 .rate_min = 48000, 156 .rate_min = 48000,
157 .rate_max = 48000, 157 .rate_max = 48000,
158 .channels_min = 2, 158 .channels_min = 2,
159 .channels_max = 2, 159 .channels_max = 2,
160 .period_bytes_min = 64, 160 .period_bytes_min = 64,
@@ -457,7 +457,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
457 if (rc < 0) 457 if (rc < 0)
458 goto error_chip; 458 goto error_chip;
459 459
460 dprintk(1,"Registered audio driver for %s\n", card->longname); 460 dprintk(1, "Registered audio driver for %s\n", card->longname);
461 461
462 return 0; 462 return 0;
463 463