The patch number 12343 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Jean Delvare <kh...@linux-fr.org>
Stop defining I2C adapter IDs nobody uses
There is no point in defining I2C adapter IDs when no code is using
them. As this field might go away in the future, stop using it when
we don't need to.
Signed-off-by: Jean Delvare <kh...@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/au0828/au0828-i2c.c | 1 -
linux/drivers/media/video/bt8xx/bttv-i2c.c | 4 ++++
linux/drivers/media/video/cafe_ccic.c | 1 -
linux/drivers/media/video/cx18/cx18-i2c.c | 2 ++
linux/drivers/media/video/cx231xx/cx231xx-i2c.c | 1 -
linux/drivers/media/video/cx23885/cx23885-i2c.c | 2 ++
linux/drivers/media/video/em28xx/em28xx-i2c.c | 2 ++
linux/drivers/media/video/hdpvr/hdpvr-i2c.c | 1 -
linux/drivers/media/video/ivtv/ivtv-i2c.c | 4 ++++
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 ++
linux/drivers/media/video/vino.c | 1 -
linux/drivers/media/video/w9968cf.c | 1 -
linux/drivers/media/video/zoran/zoran_card.c | 1 -
13 files changed, 16 insertions(+), 7 deletions(-)
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/au0828/au0828-i2c.c
--- a/linux/drivers/media/video/au0828/au0828-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/au0828/au0828-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -324,7 +324,6 @@
static struct i2c_adapter au0828_i2c_adap_template = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
- .id = I2C_HW_B_AU0828,
.algo = &au0828_i2c_algo_template,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
.class = I2C_CLASS_TV_ANALOG,
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/bt8xx/bttv-i2c.c
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -355,7 +355,9 @@
/* bt878 */
strlcpy(btv->c.i2c_adap.name, "bt878",
sizeof(btv->c.i2c_adap.name));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
btv->c.i2c_adap.id = I2C_HW_B_BT848; /* FIXME */
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
btv->c.i2c_adap.algo = (struct i2c_algorithm *)&bttv_algo;
#else
@@ -369,7 +371,9 @@
strlcpy(btv->c.i2c_adap.name, "bttv",
sizeof(btv->c.i2c_adap.name));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
btv->c.i2c_adap.id = I2C_HW_B_BT848;
+#endif
memcpy(&btv->i2c_algo, &bttv_i2c_algo_bit_template,
sizeof(bttv_i2c_algo_bit_template));
btv->i2c_algo.udelay = i2c_udelay;
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/cafe_ccic.c
--- a/linux/drivers/media/video/cafe_ccic.c Mon Jul 27 19:05:19 2009 -0300
+++ b/linux/drivers/media/video/cafe_ccic.c Fri Jun 19 19:56:56 2009 +0000
@@ -491,7 +491,6 @@
int ret;
cafe_smbus_enable_irq(cam);
- adap->id = I2C_HW_SMBUS_CAFE;
adap->owner = THIS_MODULE;
adap->algo = &cafe_smbus_algo;
strcpy(adap->name, "cafe_ccic");
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/cx18/cx18-i2c.c
--- a/linux/drivers/media/video/cx18/cx18-i2c.c Mon Jul 27 19:05:19 2009 -0300
+++ b/linux/drivers/media/video/cx18/cx18-i2c.c Fri Jun 19 19:56:56 2009 +0000
@@ -190,7 +190,9 @@
/* template for i2c-bit-algo */
static struct i2c_adapter cx18_i2c_adap_template = {
.name = "cx18 i2c driver",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX2341X,
+#endif
.algo = NULL, /* set by i2c-algo-bit */
.algo_data = NULL, /* filled from template */
.owner = THIS_MODULE,
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/cx231xx/cx231xx-i2c.c
--- a/linux/drivers/media/video/cx231xx/cx231xx-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/cx231xx/cx231xx-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -435,7 +435,6 @@
static struct i2c_adapter cx231xx_adap_template = {
.owner = THIS_MODULE,
.name = "cx231xx",
- .id = I2C_HW_B_CX231XX,
.algo = &cx231xx_algo,
};
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/cx23885/cx23885-i2c.c
--- a/linux/drivers/media/video/cx23885/cx23885-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/cx23885/cx23885-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -287,7 +287,9 @@
static struct i2c_adapter cx23885_i2c_adap_template = {
.name = "cx23885",
.owner = THIS_MODULE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX23885,
+#endif
.algo = &cx23885_i2c_algo_template,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
.class = I2C_CLASS_TV_ANALOG,
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/em28xx/em28xx-i2c.c
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -465,7 +465,9 @@
.class = I2C_CLASS_TV_ANALOG,
#endif
.name = "em28xx",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_EM28XX,
+#endif
.algo = &em28xx_algo,
};
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/hdpvr/hdpvr-i2c.c
--- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Fri Jun 19 19:56:56
2009 +0000
@@ -127,7 +127,6 @@
sizeof(i2c_adap->name));
i2c_adap->algo = &hdpvr_algo;
i2c_adap->class = I2C_CLASS_TV_ANALOG;
- i2c_adap->id = I2C_HW_B_HDPVR;
i2c_adap->owner = THIS_MODULE;
i2c_adap->dev.parent = &dev->udev->dev;
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/ivtv/ivtv-i2c.c
--- a/linux/drivers/media/video/ivtv/ivtv-i2c.c Mon Jul 27 19:05:19 2009 -0300
+++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c Fri Jun 19 19:56:56 2009 +0000
@@ -516,7 +516,9 @@
/* template for our-bit banger */
static struct i2c_adapter ivtv_i2c_adap_hw_template = {
.name = "ivtv i2c driver",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX2341X,
+#endif
.algo = &ivtv_algo,
.algo_data = NULL, /* filled from template */
.owner = THIS_MODULE,
@@ -570,7 +572,9 @@
/* template for i2c-bit-algo */
static struct i2c_adapter ivtv_i2c_adap_template = {
.name = "ivtv i2c driver",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX2341X,
+#endif
.algo = NULL, /* set by i2c-algo-bit */
.algo_data = NULL, /* filled from template */
.owner = THIS_MODULE,
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c Mon Jul 27
19:05:19 2009 -0300
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c Fri Jun 19
19:56:56 2009 +0000
@@ -618,7 +618,9 @@
static struct i2c_adapter pvr2_i2c_adap_template = {
.owner = THIS_MODULE,
.class = 0,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_BT848,
+#endif
};
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/vino.c
--- a/linux/drivers/media/video/vino.c Mon Jul 27 19:05:19 2009 -0300
+++ b/linux/drivers/media/video/vino.c Fri Jun 19 19:56:56 2009 +0000
@@ -1776,7 +1776,6 @@
static struct i2c_adapter vino_i2c_adapter = {
.name = "VINO I2C bus",
- .id = I2C_HW_SGI_VINO,
.algo = &sgi_algo,
.algo_data = &i2c_sgi_vino_data,
.owner = THIS_MODULE,
diff -r 81e6ad47ff8c -r fd96af63f79b linux/drivers/media/video/w9968cf.c
--- a/linux/drivers/media/video/w9968cf.c Mon Jul 27 19:05:19 2009 -0300
+++ b/linux/drivers/media/video/w9968cf.c Fri Jun 19 19:56:56 2009 +0000
@@ -1508,7 +1508,6 @@
};
static struct i2c_adapter adap = {
- .id = I2C_HW_SMBUS_W9968CF,
.owner = THIS_MODULE,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
.class = I2C_CLASS_TV_ANALOG,
diff -r 81e6ad47ff8c -r fd96af63f79b
linux/drivers/media/video/zoran/zoran_card.c
--- a/linux/drivers/media/video/zoran/zoran_card.c Mon Jul 27 19:05:19
2009 -0300
+++ b/linux/drivers/media/video/zoran/zoran_card.c Fri Jun 19 19:56:56
2009 +0000
@@ -733,7 +733,6 @@
memcpy(&zr->i2c_algo, &zoran_i2c_bit_data_template,
sizeof(struct i2c_algo_bit_data));
zr->i2c_algo.data = zr;
- zr->i2c_adapter.id = I2C_HW_B_ZR36067;
strlcpy(zr->i2c_adapter.name, ZR_DEVNAME(zr),
sizeof(zr->i2c_adapter.name));
i2c_set_adapdata(&zr->i2c_adapter, &zr->v4l2_dev);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/fd96af63f79b637dd910ae36d54f41a415918081
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
