rev |
line source |
pascal@9387
|
1
|
pascal@9387
|
2 # HG changeset patch
|
pascal@9387
|
3 # User Igor M. Liplianin <liplianin@me.by>
|
pascal@9387
|
4 # Date 1293902198 -7200
|
pascal@9387
|
5 # Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e
|
pascal@9387
|
6 # Parent d64b014c5253e3699e025339619a6f7704f2fb81
|
pascal@9387
|
7 [PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG
|
pascal@9387
|
8
|
pascal@9387
|
9 From: Jean Delvare <khali@linux-fr.org>
|
pascal@9387
|
10
|
pascal@9387
|
11 Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no
|
pascal@9387
|
12 I2C device driver is setting it anymore, which means it can be
|
pascal@9387
|
13 dropped. I2C devices on analog TV adapters are instantiated
|
pascal@9387
|
14 explicitly these days, which is much better.
|
pascal@9387
|
15
|
pascal@9387
|
16 Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
pascal@9387
|
17 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
pascal@9387
|
18
|
pascal@9387
|
19 --- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:13:39 2011 +0200
|
pascal@9387
|
20 +++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:16:38 2011 +0200
|
pascal@9387
|
21 @@ -127,7 +127,6 @@
|
pascal@9387
|
22 strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
|
pascal@9387
|
23 sizeof(i2c_adap->name));
|
pascal@9387
|
24 i2c_adap->algo = &hdpvr_algo;
|
pascal@9387
|
25 - i2c_adap->class = I2C_CLASS_TV_ANALOG;
|
pascal@9387
|
26 i2c_adap->owner = THIS_MODULE;
|
pascal@9387
|
27 i2c_adap->dev.parent = &dev->udev->dev;
|
pascal@9387
|
28
|
pascal@9387
|
29 --- a/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:13:39 2011 +0200
|
pascal@9387
|
30 +++ b/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:16:38 2011 +0200
|
pascal@9387
|
31 @@ -368,7 +368,6 @@
|
pascal@9387
|
32 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
|
pascal@9387
|
33
|
pascal@9387
|
34 hexium->i2c_adapter = (struct i2c_adapter) {
|
pascal@9387
|
35 - .class = I2C_CLASS_TV_ANALOG,
|
pascal@9387
|
36 .name = "hexium gemini",
|
pascal@9387
|
37 };
|
pascal@9387
|
38 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
|
pascal@9387
|
39 --- a/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:13:39 2011 +0200
|
pascal@9387
|
40 +++ b/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:16:38 2011 +0200
|
pascal@9387
|
41 @@ -231,7 +231,6 @@
|
pascal@9387
|
42 saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
|
pascal@9387
|
43
|
pascal@9387
|
44 hexium->i2c_adapter = (struct i2c_adapter) {
|
pascal@9387
|
45 - .class = I2C_CLASS_TV_ANALOG,
|
pascal@9387
|
46 .name = "hexium orion",
|
pascal@9387
|
47 };
|
pascal@9387
|
48 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
|
pascal@9387
|
49
|