aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-01-11 11:55:45 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:40:13 -0400
commit576d5739a44af5fcbacfe504a8d989a5c7ea8fc7 (patch)
treeac749276188ebd3c2efc02ecec3ff17c21716c78
parent6ad6e88a156e131597c8636456d4d84f7987808a (diff)
V4L/DVB (12834): tm6000: Fix two warnings
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/tm6000/tm6000-alsa.c12
-rw-r--r--drivers/staging/tm6000/tm6000.h4
2 files changed, 6 insertions, 10 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index 2e48bb27a554..052e2cc255f5 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -333,20 +333,11 @@ static int __devinit snd_tm6000_pcm(struct snd_tm6000_card *chip,
333 Basic Flow for Sound Devices 333 Basic Flow for Sound Devices
334 ****************************************************************************/ 334 ****************************************************************************/
335 335
336
337/*
338 * Component Destructor
339 */
340static void snd_tm6000_dev_free(struct snd_card *card)
341{
342}
343
344
345/* 336/*
346 * Alsa Constructor - Component probe 337 * Alsa Constructor - Component probe
347 */ 338 */
348 339
349static int tm6000_audio_init(struct tm6000_core *dev, int idx) 340int tm6000_audio_init(struct tm6000_core *dev, int idx)
350{ 341{
351 struct snd_card *card; 342 struct snd_card *card;
352 struct snd_tm6000_card *chip; 343 struct snd_tm6000_card *chip;
@@ -419,4 +410,5 @@ error:
419 snd_card_free(card); 410 snd_card_free(card);
420 return rc; 411 return rc;
421} 412}
413EXPORT_SYMBOL_GPL(tm6000_audio_init);
422 414
diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index 0032a418b28e..3bf4e018ded5 100644
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -252,6 +252,10 @@ unsigned int tm6000_v4l2_poll(struct file *file,
252 struct poll_table_struct *wait); 252 struct poll_table_struct *wait);
253int tm6000_queue_init(struct tm6000_core *dev); 253int tm6000_queue_init(struct tm6000_core *dev);
254 254
255/* In tm6000-alsa.c */
256int tm6000_audio_init(struct tm6000_core *dev, int idx);
257
258
255/* Debug stuff */ 259/* Debug stuff */
256 260
257extern int tm6000_debug; 261extern int tm6000_debug;