From: Hans Verkuil Date: Mon, 18 Mar 2013 15:20:36 +0000 (-0300) Subject: [media] stk1160: remove V4L2_CHIP_MATCH_AC97 placeholder X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7622fc9483f57f0dd77ad50e104b7e53d6b365d;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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, struct v4l2_dbg_chip_ident *chip) { switch (chip->match.type) { - case V4L2_CHIP_MATCH_HOST: + case V4L2_CHIP_MATCH_BRIDGE: chip->ident = V4L2_IDENT_NONE; chip->revision = 0; return 0; @@ -476,9 +476,6 @@ static int vidioc_g_register(struct file *file, void *priv, u8 val; switch (reg->match.type) { - case V4L2_CHIP_MATCH_AC97: - /* TODO: Support me please :-( */ - return -EINVAL; case V4L2_CHIP_MATCH_I2C_DRIVER: v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); return 0; @@ -505,8 +502,6 @@ static int vidioc_s_register(struct file *file, void *priv, struct stk1160 *dev = video_drvdata(file); switch (reg->match.type) { - case V4L2_CHIP_MATCH_AC97: - return -EINVAL; case V4L2_CHIP_MATCH_I2C_DRIVER: v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); return 0;