diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-06 05:16:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 18:47:33 -0400 |
commit | 96b03d2a3078d5e95a8b106634faa7cea88ebe5e (patch) | |
tree | 22f781d017cf9f27fa61a8577d896993a1e82f08 /drivers/media/v4l2-core | |
parent | 0f0fe4b9f6f32b90c82345b97da2977b84e14414 (diff) |
[media] v4l2: rename VIDIOC_DBG_G_CHIP_NAME to _CHIP_INFO
This ioctl will be extended to return more information than just the name.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-dev.c | 2 | ||||
-rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 1c3b43cf773d..5923c5dfacd5 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c | |||
@@ -592,7 +592,7 @@ static void determine_valid_ioctls(struct video_device *vdev) | |||
592 | SET_VALID_IOCTL(ops, VIDIOC_S_FREQUENCY, vidioc_s_frequency); | 592 | SET_VALID_IOCTL(ops, VIDIOC_S_FREQUENCY, vidioc_s_frequency); |
593 | SET_VALID_IOCTL(ops, VIDIOC_LOG_STATUS, vidioc_log_status); | 593 | SET_VALID_IOCTL(ops, VIDIOC_LOG_STATUS, vidioc_log_status); |
594 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 594 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
595 | set_bit(_IOC_NR(VIDIOC_DBG_G_CHIP_NAME), valid_ioctls); | 595 | set_bit(_IOC_NR(VIDIOC_DBG_G_CHIP_INFO), valid_ioctls); |
596 | set_bit(_IOC_NR(VIDIOC_DBG_G_REGISTER), valid_ioctls); | 596 | set_bit(_IOC_NR(VIDIOC_DBG_G_REGISTER), valid_ioctls); |
597 | set_bit(_IOC_NR(VIDIOC_DBG_S_REGISTER), valid_ioctls); | 597 | set_bit(_IOC_NR(VIDIOC_DBG_S_REGISTER), valid_ioctls); |
598 | #endif | 598 | #endif |
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index c48d0acd8bb9..f81bda1a48ec 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
@@ -638,9 +638,9 @@ static void v4l_print_dbg_chip_ident(const void *arg, bool write_only) | |||
638 | p->ident, p->revision); | 638 | p->ident, p->revision); |
639 | } | 639 | } |
640 | 640 | ||
641 | static void v4l_print_dbg_chip_name(const void *arg, bool write_only) | 641 | static void v4l_print_dbg_chip_info(const void *arg, bool write_only) |
642 | { | 642 | { |
643 | const struct v4l2_dbg_chip_name *p = arg; | 643 | const struct v4l2_dbg_chip_info *p = arg; |
644 | 644 | ||
645 | pr_cont("type=%u, ", p->match.type); | 645 | pr_cont("type=%u, ", p->match.type); |
646 | if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER) | 646 | if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER) |
@@ -1854,12 +1854,12 @@ static int v4l_dbg_g_chip_ident(const struct v4l2_ioctl_ops *ops, | |||
1854 | return ops->vidioc_g_chip_ident(file, fh, p); | 1854 | return ops->vidioc_g_chip_ident(file, fh, p); |
1855 | } | 1855 | } |
1856 | 1856 | ||
1857 | static int v4l_dbg_g_chip_name(const struct v4l2_ioctl_ops *ops, | 1857 | static int v4l_dbg_g_chip_info(const struct v4l2_ioctl_ops *ops, |
1858 | struct file *file, void *fh, void *arg) | 1858 | struct file *file, void *fh, void *arg) |
1859 | { | 1859 | { |
1860 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1860 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1861 | struct video_device *vfd = video_devdata(file); | 1861 | struct video_device *vfd = video_devdata(file); |
1862 | struct v4l2_dbg_chip_name *p = arg; | 1862 | struct v4l2_dbg_chip_info *p = arg; |
1863 | struct v4l2_subdev *sd; | 1863 | struct v4l2_subdev *sd; |
1864 | int idx = 0; | 1864 | int idx = 0; |
1865 | 1865 | ||
@@ -1875,8 +1875,8 @@ static int v4l_dbg_g_chip_name(const struct v4l2_ioctl_ops *ops, | |||
1875 | strlcpy(p->name, vfd->parent->driver->name, sizeof(p->name)); | 1875 | strlcpy(p->name, vfd->parent->driver->name, sizeof(p->name)); |
1876 | else | 1876 | else |
1877 | strlcpy(p->name, "bridge", sizeof(p->name)); | 1877 | strlcpy(p->name, "bridge", sizeof(p->name)); |
1878 | if (ops->vidioc_g_chip_name) | 1878 | if (ops->vidioc_g_chip_info) |
1879 | return ops->vidioc_g_chip_name(file, fh, arg); | 1879 | return ops->vidioc_g_chip_info(file, fh, arg); |
1880 | if (p->match.addr) | 1880 | if (p->match.addr) |
1881 | return -EINVAL; | 1881 | return -EINVAL; |
1882 | return 0; | 1882 | return 0; |
@@ -2116,7 +2116,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { | |||
2116 | IOCTL_INFO_STD(VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings, v4l_print_dv_timings, 0), | 2116 | IOCTL_INFO_STD(VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings, v4l_print_dv_timings, 0), |
2117 | IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, type)), | 2117 | IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, type)), |
2118 | IOCTL_INFO_FNC(VIDIOC_ENUM_FREQ_BANDS, v4l_enum_freq_bands, v4l_print_freq_band, 0), | 2118 | IOCTL_INFO_FNC(VIDIOC_ENUM_FREQ_BANDS, v4l_enum_freq_bands, v4l_print_freq_band, 0), |
2119 | 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)), | 2119 | 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)), |
2120 | }; | 2120 | }; |
2121 | #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) | 2121 | #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) |
2122 | 2122 | ||