wok annotate v4l-dvb/stuff/d0a2ff731670 @ rev 15452

Up: eeze-dev (1.7.9)
author Dominique Corbex <domcox@slitaz.org>
date Tue Nov 05 20:58:08 2013 +0100 (2013-11-05)
parents
children
rev   line source
pascal@9387 1
pascal@9387 2 # HG changeset patch
pascal@9387 3 # User Jean Delvare <khali@linux-fr.org>
pascal@9387 4 # Date 1293818674 -7200
pascal@9387 5 # Node ID d0a2ff731670f853f4e661e8542eacd29fd55131
pascal@9387 6 # Parent 3be76b724b85004860ba7c625a735bc8b060bac4
pascal@9387 7 [PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL
pascal@9387 8
pascal@9387 9 From: Jean Delvare <khali@linux-fr.org>
pascal@9387 10
pascal@9387 11 Detection class I2C_CLASS_TV_DIGITAL is set by many 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 digital 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/dvb/b2c2/flexcop-i2c.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 20 +++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 21 @@ -248,9 +248,6 @@
pascal@9387 22 i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);
pascal@9387 23 i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]);
pascal@9387 24
pascal@9387 25 - fc->fc_i2c_adap[0].i2c_adap.class =
pascal@9387 26 - fc->fc_i2c_adap[1].i2c_adap.class =
pascal@9387 27 - fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 28 fc->fc_i2c_adap[0].i2c_adap.algo =
pascal@9387 29 fc->fc_i2c_adap[1].i2c_adap.algo =
pascal@9387 30 fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;
pascal@9387 31 --- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 32 +++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 33 @@ -894,7 +894,6 @@
pascal@9387 34 i2c_set_adapdata(&dev->i2c_adap, dev);
pascal@9387 35 strcpy(dev->i2c_adap.name, DRIVER_NAME);
pascal@9387 36 dev->i2c_adap.owner = THIS_MODULE;
pascal@9387 37 - dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 38 dev->i2c_adap.dev.parent = &pdev->dev;
pascal@9387 39 dev->i2c_adap.algo = &dm1105_algo;
pascal@9387 40 dev->i2c_adap.algo_data = dev;
pascal@9387 41 --- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 42 +++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 43 @@ -1135,11 +1135,6 @@
pascal@9387 44
pascal@9387 45 strncpy(state->i2c_adap.name, d->desc->name,
pascal@9387 46 sizeof(state->i2c_adap.name));
pascal@9387 47 -#ifdef I2C_ADAP_CLASS_TV_DIGITAL
pascal@9387 48 - state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
pascal@9387 49 -#else
pascal@9387 50 - state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
pascal@9387 51 -#endif
pascal@9387 52 state->i2c_adap.algo = d->props.i2c_algo;
pascal@9387 53 state->i2c_adap.algo_data = NULL;
pascal@9387 54 state->i2c_adap.dev.parent = &d->udev->dev;
pascal@9387 55 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 56 +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 57 @@ -20,7 +20,6 @@
pascal@9387 58 }
pascal@9387 59
pascal@9387 60 strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
pascal@9387 61 - d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
pascal@9387 62 d->i2c_adap.algo = d->props.i2c_algo;
pascal@9387 63 d->i2c_adap.algo_data = NULL;
pascal@9387 64 d->i2c_adap.dev.parent = &d->udev->dev;
pascal@9387 65 --- a/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 66 +++ b/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 67 @@ -1111,7 +1111,6 @@
pascal@9387 68
pascal@9387 69 strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",
pascal@9387 70 sizeof(state->tuner_i2c_adapter.name));
pascal@9387 71 - state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL,
pascal@9387 72 state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo;
pascal@9387 73 state->tuner_i2c_adapter.algo_data = NULL;
pascal@9387 74 i2c_set_adapdata(&state->tuner_i2c_adapter, state);
pascal@9387 75 --- a/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 76 +++ b/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 77 @@ -172,7 +172,6 @@
pascal@9387 78 struct dibx000_i2c_master *mst)
pascal@9387 79 {
pascal@9387 80 strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
pascal@9387 81 - i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo;
pascal@9387 82 i2c_adap->algo_data = NULL;
pascal@9387 83 i2c_set_adapdata(i2c_adap, mst);
pascal@9387 84 if (i2c_add_adapter(i2c_adap) < 0)
pascal@9387 85 --- a/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 86 +++ b/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 87 @@ -955,7 +955,6 @@
pascal@9387 88 /* create tuner i2c adapter */
pascal@9387 89 strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",
pascal@9387 90 sizeof(state->tuner_i2c_adapter.name));
pascal@9387 91 - state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL,
pascal@9387 92 state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo;
pascal@9387 93 state->tuner_i2c_adapter.algo_data = NULL;
pascal@9387 94 i2c_set_adapdata(&state->tuner_i2c_adapter, state);
pascal@9387 95 --- a/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 96 +++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 97 @@ -159,7 +159,6 @@
pascal@9387 98 .owner = THIS_MODULE,
pascal@9387 99 .name = "Mantis I2C",
pascal@9387 100 .id = I2C_HW_B_MANTIS,
pascal@9387 101 - .class = I2C_CLASS_TV_DIGITAL,
pascal@9387 102 .algo = &mantis_algo,
pascal@9387 103 };
pascal@9387 104
pascal@9387 105 --- a/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 106 +++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 107 @@ -212,11 +212,6 @@
pascal@9387 108 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
pascal@9387 109
pascal@9387 110 i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
pascal@9387 111 -#ifdef I2C_CLASS_TV_DIGITAL
pascal@9387 112 - adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
pascal@9387 113 -#else
pascal@9387 114 - adap->class = I2C_CLASS_TV_ANALOG;
pascal@9387 115 -#endif
pascal@9387 116
pascal@9387 117 strcpy(adap->name, "nGene");
pascal@9387 118
pascal@9387 119 --- a/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 120 +++ b/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 121 @@ -655,7 +655,6 @@
pascal@9387 122 i2c_set_adapdata(&pluto->i2c_adap, pluto);
pascal@9387 123 strcpy(pluto->i2c_adap.name, DRIVER_NAME);
pascal@9387 124 pluto->i2c_adap.owner = THIS_MODULE;
pascal@9387 125 - pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 126 pluto->i2c_adap.dev.parent = &pdev->dev;
pascal@9387 127 pluto->i2c_adap.algo_data = &pluto->i2c_bit;
pascal@9387 128 pluto->i2c_bit.data = pluto;
pascal@9387 129 --- a/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 130 +++ b/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 131 @@ -1087,7 +1087,6 @@
pascal@9387 132 pt1_update_power(pt1);
pascal@9387 133
pascal@9387 134 i2c_adap = &pt1->i2c_adap;
pascal@9387 135 - i2c_adap->class = I2C_CLASS_TV_DIGITAL;
pascal@9387 136 i2c_adap->algo = &pt1_i2c_algo;
pascal@9387 137 i2c_adap->algo_data = NULL;
pascal@9387 138 i2c_adap->dev.parent = &pdev->dev;
pascal@9387 139 --- a/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 140 +++ b/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 141 @@ -2479,7 +2479,6 @@
pascal@9387 142 get recognized before the main driver is fully loaded */
pascal@9387 143 saa7146_write(dev, GPIO_CTRL, 0x500000);
pascal@9387 144
pascal@9387 145 - av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 146 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
pascal@9387 147
pascal@9387 148 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
pascal@9387 149 --- a/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 150 +++ b/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 151 @@ -495,8 +495,6 @@
pascal@9387 152 if (bi->type != BUDGET_FS_ACTIVY)
pascal@9387 153 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */
pascal@9387 154
pascal@9387 155 - budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 156 -
pascal@9387 157 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
pascal@9387 158
pascal@9387 159 saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120);
pascal@9387 160 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 161 +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 162 @@ -1717,7 +1717,6 @@
pascal@9387 163
pascal@9387 164 i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
pascal@9387 165
pascal@9387 166 - ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pascal@9387 167 ttusb->i2c_adap.algo = &ttusb_dec_algo;
pascal@9387 168 ttusb->i2c_adap.algo_data = NULL;
pascal@9387 169 ttusb->i2c_adap.dev.parent = &udev->dev;
pascal@9387 170 --- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 12:33:14 2010 +0100
pascal@9387 171 +++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 20:04:34 2010 +0200
pascal@9387 172 @@ -121,8 +121,6 @@
pascal@9387 173 memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
pascal@9387 174 sizeof(vp3054_i2c->algo));
pascal@9387 175
pascal@9387 176 - vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
pascal@9387 177 -
pascal@9387 178 vp3054_i2c->adap.dev.parent = &dev->pci->dev;
pascal@9387 179 strlcpy(vp3054_i2c->adap.name, core->name,
pascal@9387 180 sizeof(vp3054_i2c->adap.name));
pascal@9387 181