Commit 780edb7a authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab

V4L/DVB: cx18-alsa: codingstyle fixes

Fix codingstyle issues, and make the minimum version for cx18-alsa required
to be 2.6.17, so that we don't need all the #ifdefs related to the changes
to ALSA structures.

This work was sponsored by ONELAN Limited.
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4dae2f0f
...@@ -85,9 +85,9 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream) ...@@ -85,9 +85,9 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream)
/* Allocate memory */ /* Allocate memory */
item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL); item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL);
if (NULL == item) { if (NULL == item)
return -ENOMEM; return -ENOMEM;
}
item->cx = cx; item->cx = cx;
item->type = s->type; item->type = s->type;
item->open_id = cx->open_id++; item->open_id = cx->open_id++;
...@@ -223,7 +223,6 @@ snd_pcm_uframes_t snd_cx18_pcm_pointer(struct snd_pcm_substream *substream) ...@@ -223,7 +223,6 @@ snd_pcm_uframes_t snd_cx18_pcm_pointer(struct snd_pcm_substream *substream)
return hwptr_done; return hwptr_done;
} }
static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs, static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
unsigned long offset) unsigned long offset)
{ {
...@@ -341,7 +340,8 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc) ...@@ -341,7 +340,8 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc)
spin_lock_init(&cxsc->slock); spin_lock_init(&cxsc->slock);
snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, &snd_cx18_pcm_capture_ops); snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE,
&snd_cx18_pcm_capture_ops);
sp->info_flags = 0; sp->info_flags = 0;
sp->private_data = cxsc; sp->private_data = cxsc;
strlcpy(sp->name, cx->card_name, sizeof(sp->name)); strlcpy(sp->name, cx->card_name, sizeof(sp->name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment