wok-6.x diff v4l-dvb/stuff/414e0bbd99bf @ rev 12344
Up: mercurial to 2.1.2.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Apr 19 10:12:24 2012 +0000 (2012-04-19) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/v4l-dvb/stuff/414e0bbd99bf Thu Apr 19 10:12:24 2012 +0000 1.3 @@ -0,0 +1,49 @@ 1.4 + 1.5 +# HG changeset patch 1.6 +# User Igor M. Liplianin <liplianin@me.by> 1.7 +# Date 1293902198 -7200 1.8 +# Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e 1.9 +# Parent d64b014c5253e3699e025339619a6f7704f2fb81 1.10 +[PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG 1.11 + 1.12 +From: Jean Delvare <khali@linux-fr.org> 1.13 + 1.14 +Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no 1.15 +I2C device driver is setting it anymore, which means it can be 1.16 +dropped. I2C devices on analog TV adapters are instantiated 1.17 +explicitly these days, which is much better. 1.18 + 1.19 +Signed-off-by: Jean Delvare <khali@linux-fr.org> 1.20 +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> 1.21 + 1.22 +--- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:13:39 2011 +0200 1.23 ++++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:16:38 2011 +0200 1.24 +@@ -127,7 +127,6 @@ 1.25 + strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", 1.26 + sizeof(i2c_adap->name)); 1.27 + i2c_adap->algo = &hdpvr_algo; 1.28 +- i2c_adap->class = I2C_CLASS_TV_ANALOG; 1.29 + i2c_adap->owner = THIS_MODULE; 1.30 + i2c_adap->dev.parent = &dev->udev->dev; 1.31 + 1.32 +--- a/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:13:39 2011 +0200 1.33 ++++ b/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:16:38 2011 +0200 1.34 +@@ -368,7 +368,6 @@ 1.35 + saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 1.36 + 1.37 + hexium->i2c_adapter = (struct i2c_adapter) { 1.38 +- .class = I2C_CLASS_TV_ANALOG, 1.39 + .name = "hexium gemini", 1.40 + }; 1.41 + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 1.42 +--- a/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:13:39 2011 +0200 1.43 ++++ b/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:16:38 2011 +0200 1.44 +@@ -231,7 +231,6 @@ 1.45 + saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); 1.46 + 1.47 + hexium->i2c_adapter = (struct i2c_adapter) { 1.48 +- .class = I2C_CLASS_TV_ANALOG, 1.49 + .name = "hexium orion", 1.50 + }; 1.51 + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 1.52 +