diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-18 11:20:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-25 08:32:21 -0400 |
commit | c7622fc9483f57f0dd77ad50e104b7e53d6b365d (patch) | |
tree | 4d19548d63e1234cb10e2ad9672d977bd4aca830 | |
parent | 79b0c6400517456935f84f8d46c8bb0cf73f1813 (diff) |
[media] stk1160: remove V4L2_CHIP_MATCH_AC97 placeholder
It was just a placeholder and we want to get rid of the AC97 matching
define.
Also replace MATCH_HOST with MATCH_BRIDGE since we are here anyway.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-v4l.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index c4c723b92f6e..a59153d2f8bf 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c | |||
@@ -458,7 +458,7 @@ static int vidioc_g_chip_ident(struct file *file, void *priv, | |||
458 | struct v4l2_dbg_chip_ident *chip) | 458 | struct v4l2_dbg_chip_ident *chip) |
459 | { | 459 | { |
460 | switch (chip->match.type) { | 460 | switch (chip->match.type) { |
461 | case V4L2_CHIP_MATCH_HOST: | 461 | case V4L2_CHIP_MATCH_BRIDGE: |
462 | chip->ident = V4L2_IDENT_NONE; | 462 | chip->ident = V4L2_IDENT_NONE; |
463 | chip->revision = 0; | 463 | chip->revision = 0; |
464 | return 0; | 464 | return 0; |
@@ -476,9 +476,6 @@ static int vidioc_g_register(struct file *file, void *priv, | |||
476 | u8 val; | 476 | u8 val; |
477 | 477 | ||
478 | switch (reg->match.type) { | 478 | switch (reg->match.type) { |
479 | case V4L2_CHIP_MATCH_AC97: | ||
480 | /* TODO: Support me please :-( */ | ||
481 | return -EINVAL; | ||
482 | case V4L2_CHIP_MATCH_I2C_DRIVER: | 479 | case V4L2_CHIP_MATCH_I2C_DRIVER: |
483 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); | 480 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); |
484 | return 0; | 481 | return 0; |
@@ -505,8 +502,6 @@ static int vidioc_s_register(struct file *file, void *priv, | |||
505 | struct stk1160 *dev = video_drvdata(file); | 502 | struct stk1160 *dev = video_drvdata(file); |
506 | 503 | ||
507 | switch (reg->match.type) { | 504 | switch (reg->match.type) { |
508 | case V4L2_CHIP_MATCH_AC97: | ||
509 | return -EINVAL; | ||
510 | case V4L2_CHIP_MATCH_I2C_DRIVER: | 505 | case V4L2_CHIP_MATCH_I2C_DRIVER: |
511 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); | 506 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); |
512 | return 0; | 507 | return 0; |