diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:39:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:39:12 -0300 |
| commit | 456ab49bde813a457bdbc271321a7131209f7a34 (patch) | |
| tree | 295be25f1628cedfddffcc112bcc64c16b91e1ff | |
| parent | 03fac1f4cbaf888008b495441f44ff827f6d42d4 (diff) | |
| download | mediapointer-dvb-s2-456ab49bde813a457bdbc271321a7131209f7a34.tar.gz mediapointer-dvb-s2-456ab49bde813a457bdbc271321a7131209f7a34.tar.bz2 | |
cx25821: Fix some compilation troubles
From: Mauro Carvalho Chehab <mchehab@redhat.com>
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)
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/staging/cx25821/cx25821-alsa.c | 11 | ||||
| -rw-r--r-- | linux/drivers/staging/cx25821/cx25821-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/staging/cx25821/cx25821-i2c.c | 1 | ||||
| -rw-r--r-- | linux/drivers/staging/cx25821/cx25821-video.c | 4 | ||||
| -rw-r--r-- | v4l/versions.txt | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/linux/drivers/staging/cx25821/cx25821-alsa.c b/linux/drivers/staging/cx25821/cx25821-alsa.c index e8b5ffc5b..bd532ecef 100644 --- a/linux/drivers/staging/cx25821/cx25821-alsa.c +++ b/linux/drivers/staging/cx25821/cx25821-alsa.c @@ -106,7 +106,7 @@ static int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol, 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."); @@ -702,14 +702,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/linux/drivers/staging/cx25821/cx25821-core.c b/linux/drivers/staging/cx25821/cx25821-core.c index 3eca513c5..c820407a0 100644 --- a/linux/drivers/staging/cx25821/cx25821-core.c +++ b/linux/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/linux/drivers/staging/cx25821/cx25821-i2c.c b/linux/drivers/staging/cx25821/cx25821-i2c.c index 3cec12201..0769f9519 100644 --- a/linux/drivers/staging/cx25821/cx25821-i2c.c +++ b/linux/drivers/staging/cx25821/cx25821-i2c.c @@ -332,7 +332,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, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) .class = I2C_CLASS_TV_ANALOG, diff --git a/linux/drivers/staging/cx25821/cx25821-video.c b/linux/drivers/staging/cx25821/cx25821-video.c index 938635313..8834bc80a 100644 --- a/linux/drivers/staging/cx25821/cx25821-video.c +++ b/linux/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); diff --git a/v4l/versions.txt b/v4l/versions.txt index 1995c9006..f7caf396e 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -7,6 +7,9 @@ VIDEO_VPSS_SYSTEM VIDEO_VPFE_CAPTURE VIDEO_DM6446_CCDC VIDEO_DM355_CCDC +# Start version for those drivers - probably compile with older versions +VIDEO_CX25821 +VIDEO_CX25821_ALSA [2.6.29] # Needs defines that are only available from 2.6.29 |