Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[~andy/linux] / drivers / media / v4l2-core / v4l2-ioctl.c

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 336ed2dd607cae476a8e73938ca5a2baf0f67666..f81bda1a48ec33ce603a1f741466bac726298e21 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -629,8 +629,7 @@ static void v4l_print_dbg_chip_ident(const void *arg, bool write_only)
        const struct v4l2_dbg_chip_ident *p = arg;
 
        pr_cont("type=%u, ", p->match.type);
-       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME)
+       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER)
                pr_cont("name=%.*s, ",
                                (int)sizeof(p->match.name), p->match.name);
        else
@@ -639,13 +638,12 @@ static void v4l_print_dbg_chip_ident(const void *arg, bool write_only)
                        p->ident, p->revision);
 }
 
-static void v4l_print_dbg_chip_name(const void *arg, bool write_only)
+static void v4l_print_dbg_chip_info(const void *arg, bool write_only)
 {
-       const struct v4l2_dbg_chip_name *p = arg;
+       const struct v4l2_dbg_chip_info *p = arg;
 
        pr_cont("type=%u, ", p->match.type);
-       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME)
+       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER)
                pr_cont("name=%.*s, ",
                                (int)sizeof(p->match.name), p->match.name);
        else
@@ -658,8 +656,7 @@ static void v4l_print_dbg_register(const void *arg, bool write_only)
        const struct v4l2_dbg_register *p = arg;
 
        pr_cont("type=%u, ", p->match.type);
-       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME)
+       if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER)
                pr_cont("name=%.*s, ",
                                (int)sizeof(p->match.name), p->match.name);
        else
@@ -1791,14 +1788,6 @@ static int v4l_log_status(const struct v4l2_ioctl_ops *ops,
        return ret;
 }
 
-static bool v4l_dbg_found_match(const struct v4l2_dbg_match *match,
-               struct v4l2_subdev *sd, int idx)
-{
-       if (match->type == V4L2_CHIP_MATCH_SUBDEV_IDX)
-               return match->addr == idx;
-       return !strcmp(match->name, sd->name);
-}
-
 static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
@@ -1810,14 +1799,12 @@ static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV_IDX ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME) {
+       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV) {
                if (vfd->v4l2_dev == NULL)
                        return -EINVAL;
-               v4l2_device_for_each_subdev(sd, vfd->v4l2_dev) {
-                       if (v4l_dbg_found_match(&p->match, sd, idx++))
+               v4l2_device_for_each_subdev(sd, vfd->v4l2_dev)
+                       if (p->match.addr == idx++)
                                return v4l2_subdev_call(sd, core, g_register, p);
-               }
                return -EINVAL;
        }
        if (ops->vidioc_g_register)
@@ -1839,14 +1826,12 @@ static int v4l_dbg_s_register(const struct v4l2_ioctl_ops *ops,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV_IDX ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME) {
+       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV) {
                if (vfd->v4l2_dev == NULL)
                        return -EINVAL;
-               v4l2_device_for_each_subdev(sd, vfd->v4l2_dev) {
-                       if (v4l_dbg_found_match(&p->match, sd, idx++))
+               v4l2_device_for_each_subdev(sd, vfd->v4l2_dev)
+                       if (p->match.addr == idx++)
                                return v4l2_subdev_call(sd, core, s_register, p);
-               }
                return -EINVAL;
        }
        if (ops->vidioc_s_register)
@@ -1864,59 +1849,57 @@ static int v4l_dbg_g_chip_ident(const struct v4l2_ioctl_ops *ops,
 
        p->ident = V4L2_IDENT_NONE;
        p->revision = 0;
-       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV_NAME ||
-           p->match.type == V4L2_CHIP_MATCH_SUBDEV_IDX)
+       if (p->match.type == V4L2_CHIP_MATCH_SUBDEV)
                return -EINVAL;
        return ops->vidioc_g_chip_ident(file, fh, p);
 }
 
-static int v4l_dbg_g_chip_name(const struct v4l2_ioctl_ops *ops,
+static int v4l_dbg_g_chip_info(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
+#ifdef CONFIG_VIDEO_ADV_DEBUG
        struct video_device *vfd = video_devdata(file);
-       struct v4l2_dbg_chip_name *p = arg;
+       struct v4l2_dbg_chip_info *p = arg;
        struct v4l2_subdev *sd;
        int idx = 0;
 
        switch (p->match.type) {
        case V4L2_CHIP_MATCH_BRIDGE:
-#ifdef CONFIG_VIDEO_ADV_DEBUG
                if (ops->vidioc_s_register)
                        p->flags |= V4L2_CHIP_FL_WRITABLE;
                if (ops->vidioc_g_register)
                        p->flags |= V4L2_CHIP_FL_READABLE;
-#endif
-               if (ops->vidioc_g_chip_name)
-                       return ops->vidioc_g_chip_name(file, fh, arg);
-               if (p->match.addr)
-                       return -EINVAL;
                if (vfd->v4l2_dev)
                        strlcpy(p->name, vfd->v4l2_dev->name, sizeof(p->name));
                else if (vfd->parent)
                        strlcpy(p->name, vfd->parent->driver->name, sizeof(p->name));
                else
                        strlcpy(p->name, "bridge", sizeof(p->name));
+               if (ops->vidioc_g_chip_info)
+                       return ops->vidioc_g_chip_info(file, fh, arg);
+               if (p->match.addr)
+                       return -EINVAL;
                return 0;
 
-       case V4L2_CHIP_MATCH_SUBDEV_IDX:
-       case V4L2_CHIP_MATCH_SUBDEV_NAME:
+       case V4L2_CHIP_MATCH_SUBDEV:
                if (vfd->v4l2_dev == NULL)
                        break;
                v4l2_device_for_each_subdev(sd, vfd->v4l2_dev) {
-                       if (v4l_dbg_found_match(&p->match, sd, idx++)) {
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-                               if (sd->ops->core && sd->ops->core->s_register)
-                                       p->flags |= V4L2_CHIP_FL_WRITABLE;
-                               if (sd->ops->core && sd->ops->core->g_register)
-                                       p->flags |= V4L2_CHIP_FL_READABLE;
-#endif
-                               strlcpy(p->name, sd->name, sizeof(p->name));
-                               return 0;
-                       }
+                       if (p->match.addr != idx++)
+                               continue;
+                       if (sd->ops->core && sd->ops->core->s_register)
+                               p->flags |= V4L2_CHIP_FL_WRITABLE;
+                       if (sd->ops->core && sd->ops->core->g_register)
+                               p->flags |= V4L2_CHIP_FL_READABLE;
+                       strlcpy(p->name, sd->name, sizeof(p->name));
+                       return 0;
                }
                break;
        }
        return -EINVAL;
+#else
+       return -ENOTTY;
+#endif
 }
 
 static int v4l_dqevent(const struct v4l2_ioctl_ops *ops,
@@ -2133,7 +2116,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
        IOCTL_INFO_STD(VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings, v4l_print_dv_timings, 0),
        IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, type)),
        IOCTL_INFO_FNC(VIDIOC_ENUM_FREQ_BANDS, v4l_enum_freq_bands, v4l_print_freq_band, 0),
-       IOCTL_INFO_FNC(VIDIOC_DBG_G_CHIP_NAME, v4l_dbg_g_chip_name, v4l_print_dbg_chip_name, INFO_FL_CLEAR(v4l2_dbg_chip_name, match)),
+       IOCTL_INFO_FNC(VIDIOC_DBG_G_CHIP_INFO, v4l_dbg_g_chip_info, v4l_print_dbg_chip_info, INFO_FL_CLEAR(v4l2_dbg_chip_info, match)),
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)