Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e712d0 authored Sep 13, 2009 by Mauro Carvalho Chehab

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>

parent 1a9fc855

drivers/staging/cx25821/cx25821-alsa.c

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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");

drivers/staging/cx25821/cx25821-i2c.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,
	};		};

drivers/staging/cx25821/cx25821-core.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/cx25821/cx25821-video.c

+2 −2

File changed.

Contains only whitespace changes.