aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 07:50:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:48 -0400
commit4705e8c8508e4278a174855815b0fcd26fbc7e00 (patch)
treebe1e38f3016593b395ac17a3ba0b396fda9c9467 /drivers/media
parentb8341e1d2acadf3935fb299a325f569a1c20daa6 (diff)
V4L/DVB (11301): wm8775: remove legacy code for old-style i2c API
All drivers that use wm8775 are now converted to v4l2_subdev, so I can remove the support for the old-style i2c API. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/wm8775.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 53fcd42843e0..eddf11abe1d9 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -34,15 +34,12 @@
34#include <linux/videodev2.h> 34#include <linux/videodev2.h>
35#include <media/v4l2-device.h> 35#include <media/v4l2-device.h>
36#include <media/v4l2-chip-ident.h> 36#include <media/v4l2-chip-ident.h>
37#include <media/v4l2-i2c-drv-legacy.h> 37#include <media/v4l2-i2c-drv.h>
38 38
39MODULE_DESCRIPTION("wm8775 driver"); 39MODULE_DESCRIPTION("wm8775 driver");
40MODULE_AUTHOR("Ulf Eklund, Hans Verkuil"); 40MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
41MODULE_LICENSE("GPL"); 41MODULE_LICENSE("GPL");
42 42
43static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
44
45I2C_CLIENT_INSMOD;
46 43
47 44
48/* ----------------------------------------------------------------------- */ 45/* ----------------------------------------------------------------------- */
@@ -161,11 +158,6 @@ static int wm8775_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *fre
161 return 0; 158 return 0;
162} 159}
163 160
164static int wm8775_command(struct i2c_client *client, unsigned cmd, void *arg)
165{
166 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
167}
168
169/* ----------------------------------------------------------------------- */ 161/* ----------------------------------------------------------------------- */
170 162
171static const struct v4l2_subdev_core_ops wm8775_core_ops = { 163static const struct v4l2_subdev_core_ops wm8775_core_ops = {
@@ -268,8 +260,6 @@ MODULE_DEVICE_TABLE(i2c, wm8775_id);
268 260
269static struct v4l2_i2c_driver_data v4l2_i2c_data = { 261static struct v4l2_i2c_driver_data v4l2_i2c_data = {
270 .name = "wm8775", 262 .name = "wm8775",
271 .driverid = I2C_DRIVERID_WM8775,
272 .command = wm8775_command,
273 .probe = wm8775_probe, 263 .probe = wm8775_probe,
274 .remove = wm8775_remove, 264 .remove = wm8775_remove,
275 .id_table = wm8775_id, 265 .id_table = wm8775_id,