aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt866.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt866.c')
-rw-r--r--drivers/media/video/bt866.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 18d383877ece..0a32221fa3f9 100644
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -37,7 +37,7 @@
37#include <linux/videodev2.h> 37#include <linux/videodev2.h>
38#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
39#include <media/v4l2-chip-ident.h> 39#include <media/v4l2-chip-ident.h>
40#include <media/v4l2-i2c-drv-legacy.h> 40#include <media/v4l2-i2c-drv.h>
41 41
42MODULE_DESCRIPTION("Brooktree-866 video encoder driver"); 42MODULE_DESCRIPTION("Brooktree-866 video encoder driver");
43MODULE_AUTHOR("Mike Bernson & Dave Perks"); 43MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -47,9 +47,6 @@ static int debug;
47module_param(debug, int, 0); 47module_param(debug, int, 0);
48MODULE_PARM_DESC(debug, "Debug level (0-1)"); 48MODULE_PARM_DESC(debug, "Debug level (0-1)");
49 49
50static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
51
52I2C_CLIENT_INSMOD;
53 50
54/* ----------------------------------------------------------------------- */ 51/* ----------------------------------------------------------------------- */
55 52
@@ -185,11 +182,6 @@ static int bt866_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident
185 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0); 182 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0);
186} 183}
187 184
188static int bt866_command(struct i2c_client *client, unsigned cmd, void *arg)
189{
190 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
191}
192
193/* ----------------------------------------------------------------------- */ 185/* ----------------------------------------------------------------------- */
194 186
195static const struct v4l2_subdev_core_ops bt866_core_ops = { 187static const struct v4l2_subdev_core_ops bt866_core_ops = {
@@ -232,11 +224,6 @@ static int bt866_remove(struct i2c_client *client)
232 return 0; 224 return 0;
233} 225}
234 226
235static int bt866_legacy_probe(struct i2c_adapter *adapter)
236{
237 return adapter->id == I2C_HW_B_ZR36067;
238}
239
240static const struct i2c_device_id bt866_id[] = { 227static const struct i2c_device_id bt866_id[] = {
241 { "bt866", 0 }, 228 { "bt866", 0 },
242 { } 229 { }
@@ -245,10 +232,7 @@ MODULE_DEVICE_TABLE(i2c, bt866_id);
245 232
246static struct v4l2_i2c_driver_data v4l2_i2c_data = { 233static struct v4l2_i2c_driver_data v4l2_i2c_data = {
247 .name = "bt866", 234 .name = "bt866",
248 .driverid = I2C_DRIVERID_BT866,
249 .command = bt866_command,
250 .probe = bt866_probe, 235 .probe = bt866_probe,
251 .remove = bt866_remove, 236 .remove = bt866_remove,
252 .legacy_probe = bt866_legacy_probe,
253 .id_table = bt866_id, 237 .id_table = bt866_id,
254}; 238};