wok: 3fef7584bca2 v4l-dvb/stuff/d0a2ff731670

wok view v4l-dvb/stuff/d0a2ff731670 @ rev 13884

Up: cookuitls (3.0)

author	Eric Joseph-Alexandre <erjo@slitaz.org>
date	Thu Jan 17 19:17:24 2013 +0100 (2013-01-17)
parents
children

line source

2 # HG changeset patch

3 # User Jean Delvare <khali@linux-fr.org>

4 # Date 1293818674 -7200

5 # Node ID d0a2ff731670f853f4e661e8542eacd29fd55131

6 # Parent 3be76b724b85004860ba7c625a735bc8b060bac4

7 [PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL

9 From: Jean Delvare <khali@linux-fr.org>

11 Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no

12 I2C device driver is setting it anymore, which means it can be

13 dropped. I2C devices on digital TV adapters are instantiated

14 explicitly these days, which is much better.

16 Signed-off-by: Jean Delvare <khali@linux-fr.org>

17 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

19 --- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 12:33:14 2010 +0100

20 +++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 20:04:34 2010 +0200

21 @@ -248,9 +248,6 @@

22 i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);

23 i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]);

25 - fc->fc_i2c_adap[0].i2c_adap.class =

26 - fc->fc_i2c_adap[1].i2c_adap.class =

27 - fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL;

28 fc->fc_i2c_adap[0].i2c_adap.algo =

29 fc->fc_i2c_adap[1].i2c_adap.algo =

30 fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;

31 --- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 12:33:14 2010 +0100

32 +++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 20:04:34 2010 +0200

33 @@ -894,7 +894,6 @@

34 i2c_set_adapdata(&dev->i2c_adap, dev);

35 strcpy(dev->i2c_adap.name, DRIVER_NAME);

36 dev->i2c_adap.owner = THIS_MODULE;

37 - dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

38 dev->i2c_adap.dev.parent = &pdev->dev;

39 dev->i2c_adap.algo = &dm1105_algo;

40 dev->i2c_adap.algo_data = dev;

41 --- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 12:33:14 2010 +0100

42 +++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 20:04:34 2010 +0200

43 @@ -1135,11 +1135,6 @@

45 strncpy(state->i2c_adap.name, d->desc->name,

46 sizeof(state->i2c_adap.name));

47 -#ifdef I2C_ADAP_CLASS_TV_DIGITAL

48 - state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,

49 -#else

50 - state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,

51 -#endif

52 state->i2c_adap.algo = d->props.i2c_algo;

53 state->i2c_adap.algo_data = NULL;

54 state->i2c_adap.dev.parent = &d->udev->dev;

55 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 12:33:14 2010 +0100

56 +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 20:04:34 2010 +0200

57 @@ -20,7 +20,6 @@

58 }

60 strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));

61 - d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,

62 d->i2c_adap.algo = d->props.i2c_algo;

63 d->i2c_adap.algo_data = NULL;

64 d->i2c_adap.dev.parent = &d->udev->dev;

65 --- a/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 12:33:14 2010 +0100

66 +++ b/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 20:04:34 2010 +0200

67 @@ -1111,7 +1111,6 @@

69 strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",

70 sizeof(state->tuner_i2c_adapter.name));

71 - state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL,

72 state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo;

73 state->tuner_i2c_adapter.algo_data = NULL;

74 i2c_set_adapdata(&state->tuner_i2c_adapter, state);

75 --- a/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 12:33:14 2010 +0100

76 +++ b/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 20:04:34 2010 +0200

77 @@ -172,7 +172,6 @@

78 struct dibx000_i2c_master *mst)

79 {

80 strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));

81 - i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo;

82 i2c_adap->algo_data = NULL;

83 i2c_set_adapdata(i2c_adap, mst);

84 if (i2c_add_adapter(i2c_adap) < 0)

85 --- a/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 12:33:14 2010 +0100

86 +++ b/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 20:04:34 2010 +0200

87 @@ -955,7 +955,6 @@

88 /* create tuner i2c adapter */

89 strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",

90 sizeof(state->tuner_i2c_adapter.name));

91 - state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL,

92 state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo;

93 state->tuner_i2c_adapter.algo_data = NULL;

94 i2c_set_adapdata(&state->tuner_i2c_adapter, state);

95 --- a/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 12:33:14 2010 +0100

96 +++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 20:04:34 2010 +0200

97 @@ -159,7 +159,6 @@

98 .owner = THIS_MODULE,

99 .name = "Mantis I2C",

100 .id = I2C_HW_B_MANTIS,

101 - .class = I2C_CLASS_TV_DIGITAL,

102 .algo = &mantis_algo,

103 };

104

105 --- a/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 12:33:14 2010 +0100

106 +++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 20:04:34 2010 +0200

107 @@ -212,11 +212,6 @@

108 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);

109

110 i2c_set_adapdata(adap, &(dev->channel[dev_nr]));

111 -#ifdef I2C_CLASS_TV_DIGITAL

112 - adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;

113 -#else

114 - adap->class = I2C_CLASS_TV_ANALOG;

115 -#endif

116

117 strcpy(adap->name, "nGene");

118

119 --- a/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 12:33:14 2010 +0100

120 +++ b/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 20:04:34 2010 +0200

121 @@ -655,7 +655,6 @@

122 i2c_set_adapdata(&pluto->i2c_adap, pluto);

123 strcpy(pluto->i2c_adap.name, DRIVER_NAME);

124 pluto->i2c_adap.owner = THIS_MODULE;

125 - pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

126 pluto->i2c_adap.dev.parent = &pdev->dev;

127 pluto->i2c_adap.algo_data = &pluto->i2c_bit;

128 pluto->i2c_bit.data = pluto;

129 --- a/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 12:33:14 2010 +0100

130 +++ b/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 20:04:34 2010 +0200

131 @@ -1087,7 +1087,6 @@

132 pt1_update_power(pt1);

133

134 i2c_adap = &pt1->i2c_adap;

135 - i2c_adap->class = I2C_CLASS_TV_DIGITAL;

136 i2c_adap->algo = &pt1_i2c_algo;

137 i2c_adap->algo_data = NULL;

138 i2c_adap->dev.parent = &pdev->dev;

139 --- a/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 12:33:14 2010 +0100

140 +++ b/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 20:04:34 2010 +0200

141 @@ -2479,7 +2479,6 @@

142 get recognized before the main driver is fully loaded */

143 saa7146_write(dev, GPIO_CTRL, 0x500000);

144

145 - av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

146 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));

147

148 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */

149 --- a/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 12:33:14 2010 +0100

150 +++ b/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 20:04:34 2010 +0200

151 @@ -495,8 +495,6 @@

152 if (bi->type != BUDGET_FS_ACTIVY)

153 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */

154

155 - budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

156 -

157 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));

158

159 saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120);

160 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 12:33:14 2010 +0100

161 +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 20:04:34 2010 +0200

162 @@ -1717,7 +1717,6 @@

163

164 i2c_set_adapdata(&ttusb->i2c_adap, ttusb);

165

166 - ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

167 ttusb->i2c_adap.algo = &ttusb_dec_algo;

168 ttusb->i2c_adap.algo_data = NULL;

169 ttusb->i2c_adap.dev.parent = &udev->dev;

170 --- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 12:33:14 2010 +0100

171 +++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 20:04:34 2010 +0200

172 @@ -121,8 +121,6 @@

173 memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,

174 sizeof(vp3054_i2c->algo));

175

176 - vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;

177 -

178 vp3054_i2c->adap.dev.parent = &dev->pci->dev;

179 strlcpy(vp3054_i2c->adap.name, core->name,

180 sizeof(vp3054_i2c->adap.name));

181

SliTaz Repositories

wok view v4l-dvb/stuff/d0a2ff731670 @ rev 13884