korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (12734): cx25821: Fix some compilation troubles

Browse Source 
Lindent caused some compilation breakages. There were also others
related to some other changes at kernel KABI.

There's still one missing warning fix against 2.6.30:

/home/v4l/cx25821/v4l/cx25821-alsa.c: In function 'cx25821_audio_initdev':
/home/v4l/cx25821/v4l/cx25821-alsa.c:706: warning: 'snd_card_new' is deprecated (declared at include/sound/core.h:306)

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2009-09-13 11:39:12 -03:00
parent 1a9fc85564
commit 53e712d084
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/cx25821/cx25821-alsa.c
View File

@ -89,7 +89,7 @@ typedef struct cx25821_audio_dev snd_cx25821_card_t;
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = { 1,[1...(SNDRV_CARDS - 1)] = 1 }; static int enable[SNDRV_CARDS] = { 1,[1 ... (SNDRV_CARDS - 1)] = 1 };
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled."); MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
@ -679,14 +679,13 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
return (-ENOENT); return (-ENOENT);
} }
card = err = snd_card_create(index[devno], id[devno], THIS_MODULE,
snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx25821_card_t), &card);
sizeof(snd_cx25821_card_t)); if (err < 0) {
if (!card) {
printk(KERN_INFO printk(KERN_INFO
"DEBUG ERROR: cannot create snd_card_new in %s\n", "DEBUG ERROR: cannot create snd_card_new in %s\n",
__func__); __func__);
return (-ENOMEM); return err;
} }
strcpy(card->driver, "cx25821"); strcpy(card->driver, "cx25821");

2
drivers/staging/cx25821/cx25821-core.c
View File

@ -36,7 +36,7 @@ static unsigned int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages"); MODULE_PARM_DESC(debug, "enable debug messages");
static unsigned int card[] = {[0...(CX25821_MAXBOARDS - 1)] = UNSET }; static unsigned int card[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
module_param_array(card, int, NULL, 0444); module_param_array(card, int, NULL, 0444);
MODULE_PARM_DESC(card, "card type"); MODULE_PARM_DESC(card, "card type");

1
drivers/staging/cx25821/cx25821-i2c.c
View File

@ -287,7 +287,6 @@ static struct i2c_algorithm cx25821_i2c_algo_template = {
static struct i2c_adapter cx25821_i2c_adap_template = { static struct i2c_adapter cx25821_i2c_adap_template = {
.name = "cx25821", .name = "cx25821",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.id = I2C_HW_B_CX25821,
.algo = &cx25821_i2c_algo_template, .algo = &cx25821_i2c_algo_template,
}; };

4
drivers/staging/cx25821/cx25821-video.c
View File

@ -27,8 +27,8 @@ MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>"); MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static unsigned int video_nr[] = {[0...(CX25821_MAXBOARDS - 1)] = UNSET }; static unsigned int video_nr[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
static unsigned int radio_nr[] = {[0...(CX25821_MAXBOARDS - 1)] = UNSET }; static unsigned int radio_nr[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
module_param_array(video_nr, int, NULL, 0444); module_param_array(video_nr, int, NULL, 0444);
module_param_array(radio_nr, int, NULL, 0444); module_param_array(radio_nr, int, NULL, 0444);