diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 05:14:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 14:11:52 -0500 |
commit | aecde8b53b8ee1330a5a8206200f0d6b8845a6e0 (patch) | |
tree | 53a1aef6597a9d829864c054230b312010abc3a7 /drivers/media/video/soc_camera.c | |
parent | da1b5c95e49bb564ae8c61ed135d34ed09acbb66 (diff) |
V4L/DVB (10141): v4l2: debugging API changed to match against driver name instead of ID.
Since the i2c driver ID will be removed in the near future we have to
modify the v4l2 debugging API to use the driver name instead of driver ID.
Note that this API is not used in applications other than v4l2-dbg.cpp
as it is for debugging and testing only.
Should anyone use the old VIDIOC_G_CHIP_IDENT, then this will be logged
with a warning that it is deprecated and will be removed in 2.6.30.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r-- | drivers/media/video/soc_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 9986e02bcf1a..fcb05f06de8f 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -699,7 +699,7 @@ static int soc_camera_s_crop(struct file *file, void *fh, | |||
699 | } | 699 | } |
700 | 700 | ||
701 | static int soc_camera_g_chip_ident(struct file *file, void *fh, | 701 | static int soc_camera_g_chip_ident(struct file *file, void *fh, |
702 | struct v4l2_chip_ident *id) | 702 | struct v4l2_dbg_chip_ident *id) |
703 | { | 703 | { |
704 | struct soc_camera_file *icf = file->private_data; | 704 | struct soc_camera_file *icf = file->private_data; |
705 | struct soc_camera_device *icd = icf->icd; | 705 | struct soc_camera_device *icd = icf->icd; |
@@ -712,7 +712,7 @@ static int soc_camera_g_chip_ident(struct file *file, void *fh, | |||
712 | 712 | ||
713 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 713 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
714 | static int soc_camera_g_register(struct file *file, void *fh, | 714 | static int soc_camera_g_register(struct file *file, void *fh, |
715 | struct v4l2_register *reg) | 715 | struct v4l2_dbg_register *reg) |
716 | { | 716 | { |
717 | struct soc_camera_file *icf = file->private_data; | 717 | struct soc_camera_file *icf = file->private_data; |
718 | struct soc_camera_device *icd = icf->icd; | 718 | struct soc_camera_device *icd = icf->icd; |
@@ -724,7 +724,7 @@ static int soc_camera_g_register(struct file *file, void *fh, | |||
724 | } | 724 | } |
725 | 725 | ||
726 | static int soc_camera_s_register(struct file *file, void *fh, | 726 | static int soc_camera_s_register(struct file *file, void *fh, |
727 | struct v4l2_register *reg) | 727 | struct v4l2_dbg_register *reg) |
728 | { | 728 | { |
729 | struct soc_camera_file *icf = file->private_data; | 729 | struct soc_camera_file *icf = file->private_data; |
730 | struct soc_camera_device *icd = icf->icd; | 730 | struct soc_camera_device *icd = icf->icd; |