Skip to content

Commit

Permalink
[media] TM6000: alsa: Clean up kernel coding style errors
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adam M. Dutko authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 51b6d71 commit 37f9619
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/tm6000/tm6000-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>

#include <asm/delay.h>
#include <linux/delay.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
Expand Down Expand Up @@ -84,7 +84,6 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip)

tm6000_set_audio_bitrate(core, 48000);


return 0;
}

Expand Down Expand Up @@ -123,6 +122,7 @@ static int dsp_buffer_alloc(struct snd_pcm_substream *substream, int size)
if (substream->runtime->dma_area) {
if (substream->runtime->dma_bytes > size)
return 0;

dsp_buffer_free(substream);
}

Expand Down Expand Up @@ -152,9 +152,9 @@ static struct snd_pcm_hardware snd_tm6000_digital_hw = {
SNDRV_PCM_INFO_MMAP_VALID,
.formats = SNDRV_PCM_FMTBIT_S16_LE,

.rates = SNDRV_PCM_RATE_CONTINUOUS,
.rate_min = 48000,
.rate_max = 48000,
.rates = SNDRV_PCM_RATE_CONTINUOUS,
.rate_min = 48000,
.rate_max = 48000,
.channels_min = 2,
.channels_max = 2,
.period_bytes_min = 64,
Expand Down Expand Up @@ -457,7 +457,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
if (rc < 0)
goto error_chip;

dprintk(1,"Registered audio driver for %s\n", card->longname);
dprintk(1, "Registered audio driver for %s\n", card->longname);

return 0;

Expand Down

0 comments on commit 37f9619

Please sign in to comment.