wok diff v4l-dvb/stuff/d0a2ff731670 @ rev 12296
Modify WGET_URL
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Mon Apr 16 12:12:13 2012 +0200 (2012-04-16) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/v4l-dvb/stuff/d0a2ff731670 Mon Apr 16 12:12:13 2012 +0200 1.3 @@ -0,0 +1,181 @@ 1.4 + 1.5 +# HG changeset patch 1.6 +# User Jean Delvare <khali@linux-fr.org> 1.7 +# Date 1293818674 -7200 1.8 +# Node ID d0a2ff731670f853f4e661e8542eacd29fd55131 1.9 +# Parent 3be76b724b85004860ba7c625a735bc8b060bac4 1.10 +[PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 1.11 + 1.12 +From: Jean Delvare <khali@linux-fr.org> 1.13 + 1.14 +Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no 1.15 +I2C device driver is setting it anymore, which means it can be 1.16 +dropped. I2C devices on digital 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/dvb/b2c2/flexcop-i2c.c Fri Dec 31 12:33:14 2010 +0100 1.23 ++++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 20:04:34 2010 +0200 1.24 +@@ -248,9 +248,6 @@ 1.25 + i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); 1.26 + i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]); 1.27 + 1.28 +- fc->fc_i2c_adap[0].i2c_adap.class = 1.29 +- fc->fc_i2c_adap[1].i2c_adap.class = 1.30 +- fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.31 + fc->fc_i2c_adap[0].i2c_adap.algo = 1.32 + fc->fc_i2c_adap[1].i2c_adap.algo = 1.33 + fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo; 1.34 +--- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 12:33:14 2010 +0100 1.35 ++++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 20:04:34 2010 +0200 1.36 +@@ -894,7 +894,6 @@ 1.37 + i2c_set_adapdata(&dev->i2c_adap, dev); 1.38 + strcpy(dev->i2c_adap.name, DRIVER_NAME); 1.39 + dev->i2c_adap.owner = THIS_MODULE; 1.40 +- dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.41 + dev->i2c_adap.dev.parent = &pdev->dev; 1.42 + dev->i2c_adap.algo = &dm1105_algo; 1.43 + dev->i2c_adap.algo_data = dev; 1.44 +--- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 12:33:14 2010 +0100 1.45 ++++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 20:04:34 2010 +0200 1.46 +@@ -1135,11 +1135,6 @@ 1.47 + 1.48 + strncpy(state->i2c_adap.name, d->desc->name, 1.49 + sizeof(state->i2c_adap.name)); 1.50 +-#ifdef I2C_ADAP_CLASS_TV_DIGITAL 1.51 +- state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL, 1.52 +-#else 1.53 +- state->i2c_adap.class = I2C_CLASS_TV_DIGITAL, 1.54 +-#endif 1.55 + state->i2c_adap.algo = d->props.i2c_algo; 1.56 + state->i2c_adap.algo_data = NULL; 1.57 + state->i2c_adap.dev.parent = &d->udev->dev; 1.58 +--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 12:33:14 2010 +0100 1.59 ++++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 20:04:34 2010 +0200 1.60 +@@ -20,7 +20,6 @@ 1.61 + } 1.62 + 1.63 + strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); 1.64 +- d->i2c_adap.class = I2C_CLASS_TV_DIGITAL, 1.65 + d->i2c_adap.algo = d->props.i2c_algo; 1.66 + d->i2c_adap.algo_data = NULL; 1.67 + d->i2c_adap.dev.parent = &d->udev->dev; 1.68 +--- a/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 12:33:14 2010 +0100 1.69 ++++ b/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 20:04:34 2010 +0200 1.70 +@@ -1111,7 +1111,6 @@ 1.71 + 1.72 + strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", 1.73 + sizeof(state->tuner_i2c_adapter.name)); 1.74 +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, 1.75 + state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; 1.76 + state->tuner_i2c_adapter.algo_data = NULL; 1.77 + i2c_set_adapdata(&state->tuner_i2c_adapter, state); 1.78 +--- a/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 12:33:14 2010 +0100 1.79 ++++ b/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 20:04:34 2010 +0200 1.80 +@@ -172,7 +172,6 @@ 1.81 + struct dibx000_i2c_master *mst) 1.82 + { 1.83 + strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); 1.84 +- i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo; 1.85 + i2c_adap->algo_data = NULL; 1.86 + i2c_set_adapdata(i2c_adap, mst); 1.87 + if (i2c_add_adapter(i2c_adap) < 0) 1.88 +--- a/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 12:33:14 2010 +0100 1.89 ++++ b/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 20:04:34 2010 +0200 1.90 +@@ -955,7 +955,6 @@ 1.91 + /* create tuner i2c adapter */ 1.92 + strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", 1.93 + sizeof(state->tuner_i2c_adapter.name)); 1.94 +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, 1.95 + state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; 1.96 + state->tuner_i2c_adapter.algo_data = NULL; 1.97 + i2c_set_adapdata(&state->tuner_i2c_adapter, state); 1.98 +--- a/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 12:33:14 2010 +0100 1.99 ++++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 20:04:34 2010 +0200 1.100 +@@ -159,7 +159,6 @@ 1.101 + .owner = THIS_MODULE, 1.102 + .name = "Mantis I2C", 1.103 + .id = I2C_HW_B_MANTIS, 1.104 +- .class = I2C_CLASS_TV_DIGITAL, 1.105 + .algo = &mantis_algo, 1.106 + }; 1.107 + 1.108 +--- a/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 12:33:14 2010 +0100 1.109 ++++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 20:04:34 2010 +0200 1.110 +@@ -212,11 +212,6 @@ 1.111 + struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); 1.112 + 1.113 + i2c_set_adapdata(adap, &(dev->channel[dev_nr])); 1.114 +-#ifdef I2C_CLASS_TV_DIGITAL 1.115 +- adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG; 1.116 +-#else 1.117 +- adap->class = I2C_CLASS_TV_ANALOG; 1.118 +-#endif 1.119 + 1.120 + strcpy(adap->name, "nGene"); 1.121 + 1.122 +--- a/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 12:33:14 2010 +0100 1.123 ++++ b/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 20:04:34 2010 +0200 1.124 +@@ -655,7 +655,6 @@ 1.125 + i2c_set_adapdata(&pluto->i2c_adap, pluto); 1.126 + strcpy(pluto->i2c_adap.name, DRIVER_NAME); 1.127 + pluto->i2c_adap.owner = THIS_MODULE; 1.128 +- pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.129 + pluto->i2c_adap.dev.parent = &pdev->dev; 1.130 + pluto->i2c_adap.algo_data = &pluto->i2c_bit; 1.131 + pluto->i2c_bit.data = pluto; 1.132 +--- a/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 12:33:14 2010 +0100 1.133 ++++ b/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 20:04:34 2010 +0200 1.134 +@@ -1087,7 +1087,6 @@ 1.135 + pt1_update_power(pt1); 1.136 + 1.137 + i2c_adap = &pt1->i2c_adap; 1.138 +- i2c_adap->class = I2C_CLASS_TV_DIGITAL; 1.139 + i2c_adap->algo = &pt1_i2c_algo; 1.140 + i2c_adap->algo_data = NULL; 1.141 + i2c_adap->dev.parent = &pdev->dev; 1.142 +--- a/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 12:33:14 2010 +0100 1.143 ++++ b/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 20:04:34 2010 +0200 1.144 +@@ -2479,7 +2479,6 @@ 1.145 + get recognized before the main driver is fully loaded */ 1.146 + saa7146_write(dev, GPIO_CTRL, 0x500000); 1.147 + 1.148 +- av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.149 + strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); 1.150 + 1.151 + saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ 1.152 +--- a/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 12:33:14 2010 +0100 1.153 ++++ b/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 20:04:34 2010 +0200 1.154 +@@ -495,8 +495,6 @@ 1.155 + if (bi->type != BUDGET_FS_ACTIVY) 1.156 + saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ 1.157 + 1.158 +- budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.159 +- 1.160 + strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); 1.161 + 1.162 + saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); 1.163 +--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 12:33:14 2010 +0100 1.164 ++++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 20:04:34 2010 +0200 1.165 +@@ -1717,7 +1717,6 @@ 1.166 + 1.167 + i2c_set_adapdata(&ttusb->i2c_adap, ttusb); 1.168 + 1.169 +- ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 1.170 + ttusb->i2c_adap.algo = &ttusb_dec_algo; 1.171 + ttusb->i2c_adap.algo_data = NULL; 1.172 + ttusb->i2c_adap.dev.parent = &udev->dev; 1.173 +--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 12:33:14 2010 +0100 1.174 ++++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 20:04:34 2010 +0200 1.175 +@@ -121,8 +121,6 @@ 1.176 + memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, 1.177 + sizeof(vp3054_i2c->algo)); 1.178 + 1.179 +- vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL; 1.180 +- 1.181 + vp3054_i2c->adap.dev.parent = &dev->pci->dev; 1.182 + strlcpy(vp3054_i2c->adap.name, core->name, 1.183 + sizeof(vp3054_i2c->adap.name)); 1.184 +