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

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>

diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index 0e162f7c8ab80130d47708633a16d99e4812f9f1..e0eef12759e46eb9fc93c725957bd22ef7770be5 100644 (file)
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -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 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_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
@@ -679,14 +679,13 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
                return (-ENOENT);
        }
 
-       card =
-           snd_card_new(index[devno], id[devno], THIS_MODULE,
-                        sizeof(snd_cx25821_card_t));
-       if (!card) {
+       err = snd_card_create(index[devno], id[devno], THIS_MODULE,
+                        sizeof(snd_cx25821_card_t), &card);
+       if (err < 0) {
                printk(KERN_INFO
                       "DEBUG ERROR: cannot create snd_card_new in %s\n",
                       __func__);
-               return (-ENOMEM);
+               return err;
        }
 
        strcpy(card->driver, "cx25821");

diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/staging/cx25821/cx25821-core.c
index 4d1ee06fb918fc74e8d83487cb8be4b861c20619..8aceae5a072e08fd4c6b2351b77ac9f445db59dd 100644 (file)
--- a/drivers/staging/cx25821/cx25821-core.c
+++ b/drivers/staging/cx25821/cx25821-core.c
@@ -36,7 +36,7 @@ static unsigned int debug;
 module_param(debug, int, 0644);
 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_PARM_DESC(card, "card type");
 

diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/staging/cx25821/cx25821-i2c.c
index cb260fa6f3468f184a930c45b0180c3cc5a37e52..f4f2681d8f1c867a0f7a1d04e94f72d12209b073 100644 (file)
--- a/drivers/staging/cx25821/cx25821-i2c.c
+++ b/drivers/staging/cx25821/cx25821-i2c.c
@@ -287,7 +287,6 @@ static struct i2c_algorithm cx25821_i2c_algo_template = {
 static struct i2c_adapter cx25821_i2c_adap_template = {
        .name = "cx25821",
        .owner = THIS_MODULE,
-       .id = I2C_HW_B_CX25821,
        .algo = &cx25821_i2c_algo_template,
 };
 

diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 93863531312b2bc7a4664e906aa04053c11ef6c6..8834bc80a5ab575c4a54efbea1cf10fbdaddb09d 100644 (file)
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -27,8 +27,8 @@ MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
 MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
 MODULE_LICENSE("GPL");
 
-static unsigned int video_nr[] = {[0...(CX25821_MAXBOARDS - 1)] = UNSET };
-static unsigned int radio_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 };
 
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);