diff options
Diffstat (limited to 'drivers/media/i2c/ks0127.c')
-rw-r--r-- | drivers/media/i2c/ks0127.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c index c7227763240e..b5223e850a26 100644 --- a/drivers/media/i2c/ks0127.c +++ b/drivers/media/i2c/ks0127.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <linux/videodev2.h> | 42 | #include <linux/videodev2.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <media/v4l2-device.h> | 44 | #include <media/v4l2-device.h> |
45 | #include <media/v4l2-chip-ident.h> | ||
46 | #include "ks0127.h" | 45 | #include "ks0127.h" |
47 | 46 | ||
48 | MODULE_DESCRIPTION("KS0127 video decoder driver"); | 47 | MODULE_DESCRIPTION("KS0127 video decoder driver"); |
@@ -200,7 +199,6 @@ struct adjust { | |||
200 | struct ks0127 { | 199 | struct ks0127 { |
201 | struct v4l2_subdev sd; | 200 | struct v4l2_subdev sd; |
202 | v4l2_std_id norm; | 201 | v4l2_std_id norm; |
203 | int ident; | ||
204 | u8 regs[256]; | 202 | u8 regs[256]; |
205 | }; | 203 | }; |
206 | 204 | ||
@@ -371,12 +369,9 @@ static void ks0127_and_or(struct v4l2_subdev *sd, u8 reg, u8 and_v, u8 or_v) | |||
371 | ****************************************************************************/ | 369 | ****************************************************************************/ |
372 | static void ks0127_init(struct v4l2_subdev *sd) | 370 | static void ks0127_init(struct v4l2_subdev *sd) |
373 | { | 371 | { |
374 | struct ks0127 *ks = to_ks0127(sd); | ||
375 | u8 *table = reg_defaults; | 372 | u8 *table = reg_defaults; |
376 | int i; | 373 | int i; |
377 | 374 | ||
378 | ks->ident = V4L2_IDENT_KS0127; | ||
379 | |||
380 | v4l2_dbg(1, debug, sd, "reset\n"); | 375 | v4l2_dbg(1, debug, sd, "reset\n"); |
381 | msleep(1); | 376 | msleep(1); |
382 | 377 | ||
@@ -397,7 +392,6 @@ static void ks0127_init(struct v4l2_subdev *sd) | |||
397 | 392 | ||
398 | 393 | ||
399 | if ((ks0127_read(sd, KS_STAT) & 0x80) == 0) { | 394 | if ((ks0127_read(sd, KS_STAT) & 0x80) == 0) { |
400 | ks->ident = V4L2_IDENT_KS0122S; | ||
401 | v4l2_dbg(1, debug, sd, "ks0122s found\n"); | 395 | v4l2_dbg(1, debug, sd, "ks0122s found\n"); |
402 | return; | 396 | return; |
403 | } | 397 | } |
@@ -408,7 +402,6 @@ static void ks0127_init(struct v4l2_subdev *sd) | |||
408 | break; | 402 | break; |
409 | 403 | ||
410 | case 9: | 404 | case 9: |
411 | ks->ident = V4L2_IDENT_KS0127B; | ||
412 | v4l2_dbg(1, debug, sd, "ks0127B Revision A found\n"); | 405 | v4l2_dbg(1, debug, sd, "ks0127B Revision A found\n"); |
413 | break; | 406 | break; |
414 | 407 | ||
@@ -646,18 +639,9 @@ static int ks0127_g_input_status(struct v4l2_subdev *sd, u32 *status) | |||
646 | return ks0127_status(sd, status, NULL); | 639 | return ks0127_status(sd, status, NULL); |
647 | } | 640 | } |
648 | 641 | ||
649 | static int ks0127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip) | ||
650 | { | ||
651 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
652 | struct ks0127 *ks = to_ks0127(sd); | ||
653 | |||
654 | return v4l2_chip_ident_i2c_client(client, chip, ks->ident, 0); | ||
655 | } | ||
656 | |||
657 | /* ----------------------------------------------------------------------- */ | 642 | /* ----------------------------------------------------------------------- */ |
658 | 643 | ||
659 | static const struct v4l2_subdev_core_ops ks0127_core_ops = { | 644 | static const struct v4l2_subdev_core_ops ks0127_core_ops = { |
660 | .g_chip_ident = ks0127_g_chip_ident, | ||
661 | .s_std = ks0127_s_std, | 645 | .s_std = ks0127_s_std, |
662 | }; | 646 | }; |
663 | 647 | ||