diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 08:19:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:49 -0400 |
commit | a0d1251da012594381165e36590312009693bf49 (patch) | |
tree | b5f82e006f7d3d43f9779020964523749bbf6a42 | |
parent | 267ea2a9dc53eba8a314db74c169223d7c775145 (diff) |
V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer needed.
Several i2c drivers still used v4l2_subdev_command, even though they were
converted to v4l2_subdev. Remove those unused .command callbacks.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/cs5345.c | 7 | ||||
-rw-r--r-- | drivers/media/video/m52790.c | 6 | ||||
-rw-r--r-- | drivers/media/video/ovcamchip/ovcamchip_core.c | 6 | ||||
-rw-r--r-- | drivers/media/video/saa717x.c | 7 | ||||
-rw-r--r-- | drivers/media/video/tlv320aic23b.c | 6 | ||||
-rw-r--r-- | drivers/media/video/upd64031a.c | 6 | ||||
-rw-r--r-- | drivers/media/video/upd64083.c | 6 | ||||
-rw-r--r-- | drivers/media/video/vp27smpx.c | 6 | ||||
-rw-r--r-- | drivers/media/video/wm8739.c | 6 |
9 files changed, 0 insertions, 56 deletions
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c index 87e91072627a..9714059ee949 100644 --- a/drivers/media/video/cs5345.c +++ b/drivers/media/video/cs5345.c | |||
@@ -141,11 +141,6 @@ static int cs5345_log_status(struct v4l2_subdev *sd) | |||
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
143 | 143 | ||
144 | static int cs5345_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
145 | { | ||
146 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
147 | } | ||
148 | |||
149 | /* ----------------------------------------------------------------------- */ | 144 | /* ----------------------------------------------------------------------- */ |
150 | 145 | ||
151 | static const struct v4l2_subdev_core_ops cs5345_core_ops = { | 146 | static const struct v4l2_subdev_core_ops cs5345_core_ops = { |
@@ -214,8 +209,6 @@ MODULE_DEVICE_TABLE(i2c, cs5345_id); | |||
214 | 209 | ||
215 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 210 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
216 | .name = "cs5345", | 211 | .name = "cs5345", |
217 | .driverid = I2C_DRIVERID_CS5345, | ||
218 | .command = cs5345_command, | ||
219 | .probe = cs5345_probe, | 212 | .probe = cs5345_probe, |
220 | .remove = cs5345_remove, | 213 | .remove = cs5345_remove, |
221 | .id_table = cs5345_id, | 214 | .id_table = cs5345_id, |
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c index 41988072b973..1f340fefc49d 100644 --- a/drivers/media/video/m52790.c +++ b/drivers/media/video/m52790.c | |||
@@ -132,11 +132,6 @@ static int m52790_log_status(struct v4l2_subdev *sd) | |||
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | static int m52790_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
136 | { | ||
137 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
138 | } | ||
139 | |||
140 | /* ----------------------------------------------------------------------- */ | 135 | /* ----------------------------------------------------------------------- */ |
141 | 136 | ||
142 | static const struct v4l2_subdev_core_ops m52790_core_ops = { | 137 | static const struct v4l2_subdev_core_ops m52790_core_ops = { |
@@ -210,7 +205,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id); | |||
210 | 205 | ||
211 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 206 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
212 | .name = "m52790", | 207 | .name = "m52790", |
213 | .command = m52790_command, | ||
214 | .probe = m52790_probe, | 208 | .probe = m52790_probe, |
215 | .remove = m52790_remove, | 209 | .remove = m52790_remove, |
216 | .id_table = m52790_id, | 210 | .id_table = m52790_id, |
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c index 21ec1dd2e1e5..d573d8428998 100644 --- a/drivers/media/video/ovcamchip/ovcamchip_core.c +++ b/drivers/media/video/ovcamchip/ovcamchip_core.c | |||
@@ -322,11 +322,6 @@ static long ovcamchip_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) | |||
322 | } | 322 | } |
323 | } | 323 | } |
324 | 324 | ||
325 | static int ovcamchip_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
326 | { | ||
327 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
328 | } | ||
329 | |||
330 | /* ----------------------------------------------------------------------- */ | 325 | /* ----------------------------------------------------------------------- */ |
331 | 326 | ||
332 | static const struct v4l2_subdev_core_ops ovcamchip_core_ops = { | 327 | static const struct v4l2_subdev_core_ops ovcamchip_core_ops = { |
@@ -394,7 +389,6 @@ MODULE_DEVICE_TABLE(i2c, ovcamchip_id); | |||
394 | 389 | ||
395 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 390 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
396 | .name = "ovcamchip", | 391 | .name = "ovcamchip", |
397 | .command = ovcamchip_command, | ||
398 | .probe = ovcamchip_probe, | 392 | .probe = ovcamchip_probe, |
399 | .remove = ovcamchip_remove, | 393 | .remove = ovcamchip_remove, |
400 | .id_table = ovcamchip_id, | 394 | .id_table = ovcamchip_id, |
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 5ad7a77699de..25bf2303a6b5 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
@@ -1380,11 +1380,6 @@ static int saa717x_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) | |||
1380 | return 0; | 1380 | return 0; |
1381 | } | 1381 | } |
1382 | 1382 | ||
1383 | static int saa717x_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
1384 | { | ||
1385 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
1386 | } | ||
1387 | |||
1388 | /* ----------------------------------------------------------------------- */ | 1383 | /* ----------------------------------------------------------------------- */ |
1389 | 1384 | ||
1390 | static const struct v4l2_subdev_core_ops saa717x_core_ops = { | 1385 | static const struct v4l2_subdev_core_ops saa717x_core_ops = { |
@@ -1528,9 +1523,7 @@ MODULE_DEVICE_TABLE(i2c, saa717x_id); | |||
1528 | 1523 | ||
1529 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 1524 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
1530 | .name = "saa717x", | 1525 | .name = "saa717x", |
1531 | .command = saa717x_command, | ||
1532 | .probe = saa717x_probe, | 1526 | .probe = saa717x_probe, |
1533 | .remove = saa717x_remove, | 1527 | .remove = saa717x_remove, |
1534 | .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, | ||
1535 | .id_table = saa717x_id, | 1528 | .id_table = saa717x_id, |
1536 | }; | 1529 | }; |
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c index b8cc7d39a90a..07789c64814c 100644 --- a/drivers/media/video/tlv320aic23b.c +++ b/drivers/media/video/tlv320aic23b.c | |||
@@ -118,11 +118,6 @@ static int tlv320aic23b_log_status(struct v4l2_subdev *sd) | |||
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | 120 | ||
121 | static int tlv320aic23b_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
122 | { | ||
123 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
124 | } | ||
125 | |||
126 | /* ----------------------------------------------------------------------- */ | 121 | /* ----------------------------------------------------------------------- */ |
127 | 122 | ||
128 | static const struct v4l2_subdev_core_ops tlv320aic23b_core_ops = { | 123 | static const struct v4l2_subdev_core_ops tlv320aic23b_core_ops = { |
@@ -205,7 +200,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id); | |||
205 | 200 | ||
206 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 201 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
207 | .name = "tlv320aic23b", | 202 | .name = "tlv320aic23b", |
208 | .command = tlv320aic23b_command, | ||
209 | .probe = tlv320aic23b_probe, | 203 | .probe = tlv320aic23b_probe, |
210 | .remove = tlv320aic23b_remove, | 204 | .remove = tlv320aic23b_remove, |
211 | .id_table = tlv320aic23b_id, | 205 | .id_table = tlv320aic23b_id, |
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c index 5b2c4399027c..c0ac651bb358 100644 --- a/drivers/media/video/upd64031a.c +++ b/drivers/media/video/upd64031a.c | |||
@@ -187,11 +187,6 @@ static int upd64031a_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register | |||
187 | } | 187 | } |
188 | #endif | 188 | #endif |
189 | 189 | ||
190 | static int upd64031a_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
191 | { | ||
192 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
193 | } | ||
194 | |||
195 | /* ----------------------------------------------------------------------- */ | 190 | /* ----------------------------------------------------------------------- */ |
196 | 191 | ||
197 | static const struct v4l2_subdev_core_ops upd64031a_core_ops = { | 192 | static const struct v4l2_subdev_core_ops upd64031a_core_ops = { |
@@ -267,7 +262,6 @@ MODULE_DEVICE_TABLE(i2c, upd64031a_id); | |||
267 | 262 | ||
268 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 263 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
269 | .name = "upd64031a", | 264 | .name = "upd64031a", |
270 | .command = upd64031a_command, | ||
271 | .probe = upd64031a_probe, | 265 | .probe = upd64031a_probe, |
272 | .remove = upd64031a_remove, | 266 | .remove = upd64031a_remove, |
273 | .id_table = upd64031a_id, | 267 | .id_table = upd64031a_id, |
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c index acd66c172efe..410c915d51fa 100644 --- a/drivers/media/video/upd64083.c +++ b/drivers/media/video/upd64083.c | |||
@@ -164,11 +164,6 @@ static int upd64083_log_status(struct v4l2_subdev *sd) | |||
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
167 | static int upd64083_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
168 | { | ||
169 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
170 | } | ||
171 | |||
172 | /* ----------------------------------------------------------------------- */ | 167 | /* ----------------------------------------------------------------------- */ |
173 | 168 | ||
174 | static const struct v4l2_subdev_core_ops upd64083_core_ops = { | 169 | static const struct v4l2_subdev_core_ops upd64083_core_ops = { |
@@ -239,7 +234,6 @@ MODULE_DEVICE_TABLE(i2c, upd64083_id); | |||
239 | 234 | ||
240 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 235 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
241 | .name = "upd64083", | 236 | .name = "upd64083", |
242 | .command = upd64083_command, | ||
243 | .probe = upd64083_probe, | 237 | .probe = upd64083_probe, |
244 | .remove = upd64083_remove, | 238 | .remove = upd64083_remove, |
245 | .id_table = upd64083_id, | 239 | .id_table = upd64083_id, |
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c index 9a590a91d7de..42e23a4fa607 100644 --- a/drivers/media/video/vp27smpx.c +++ b/drivers/media/video/vp27smpx.c | |||
@@ -129,11 +129,6 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd) | |||
129 | return 0; | 129 | return 0; |
130 | } | 130 | } |
131 | 131 | ||
132 | static int vp27smpx_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
133 | { | ||
134 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
135 | } | ||
136 | |||
137 | /* ----------------------------------------------------------------------- */ | 132 | /* ----------------------------------------------------------------------- */ |
138 | 133 | ||
139 | static const struct v4l2_subdev_core_ops vp27smpx_core_ops = { | 134 | static const struct v4l2_subdev_core_ops vp27smpx_core_ops = { |
@@ -206,7 +201,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id); | |||
206 | 201 | ||
207 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 202 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
208 | .name = "vp27smpx", | 203 | .name = "vp27smpx", |
209 | .command = vp27smpx_command, | ||
210 | .probe = vp27smpx_probe, | 204 | .probe = vp27smpx_probe, |
211 | .remove = vp27smpx_remove, | 205 | .remove = vp27smpx_remove, |
212 | .id_table = vp27smpx_id, | 206 | .id_table = vp27smpx_id, |
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c index 18535c4a0549..b572ce288e14 100644 --- a/drivers/media/video/wm8739.c +++ b/drivers/media/video/wm8739.c | |||
@@ -252,11 +252,6 @@ static int wm8739_log_status(struct v4l2_subdev *sd) | |||
252 | return 0; | 252 | return 0; |
253 | } | 253 | } |
254 | 254 | ||
255 | static int wm8739_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
256 | { | ||
257 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
258 | } | ||
259 | |||
260 | /* ----------------------------------------------------------------------- */ | 255 | /* ----------------------------------------------------------------------- */ |
261 | 256 | ||
262 | static const struct v4l2_subdev_core_ops wm8739_core_ops = { | 257 | static const struct v4l2_subdev_core_ops wm8739_core_ops = { |
@@ -343,7 +338,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id); | |||
343 | 338 | ||
344 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 339 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
345 | .name = "wm8739", | 340 | .name = "wm8739", |
346 | .command = wm8739_command, | ||
347 | .probe = wm8739_probe, | 341 | .probe = wm8739_probe, |
348 | .remove = wm8739_remove, | 342 | .remove = wm8739_remove, |
349 | .id_table = wm8739_id, | 343 | .id_table = wm8739_id, |