diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-11-26 17:42:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 07:40:02 -0500 |
commit | 976036df5e09eb0aaabbec77bcac00e6dd66422a (patch) | |
tree | 849b3e730caf4ebee09ace058c7f4e305585b8c6 /drivers/media/platform/soc_camera/soc_camera.c | |
parent | cb06b705e3eaf2e3f69e6e5e2ded8b07b2711627 (diff) |
[media] soc_camera: use vb2_ops_wait_prepare/finish helper
This patch drops driver specific wait_prepare() and
wait_finish() callbacks from vb2_ops and instead uses
the the helpers vb2_ops_wait_prepare/finish() provided
by the vb2 core, the lock member of the queue needs
to be initalized to a mutex so that vb2 helpers
vb2_ops_wait_prepare/finish() can make use of it.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Josh Wu <josh.wu@atmel.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/soc_camera/soc_camera.c')
-rw-r--r-- | drivers/media/platform/soc_camera/soc_camera.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index b3db51c82bde..4105a9ed5f71 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c | |||
@@ -843,22 +843,6 @@ static unsigned int soc_camera_poll(struct file *file, poll_table *pt) | |||
843 | return res; | 843 | return res; |
844 | } | 844 | } |
845 | 845 | ||
846 | void soc_camera_lock(struct vb2_queue *vq) | ||
847 | { | ||
848 | struct soc_camera_device *icd = vb2_get_drv_priv(vq); | ||
849 | struct soc_camera_host *ici = to_soc_camera_host(icd->parent); | ||
850 | mutex_lock(&ici->host_lock); | ||
851 | } | ||
852 | EXPORT_SYMBOL(soc_camera_lock); | ||
853 | |||
854 | void soc_camera_unlock(struct vb2_queue *vq) | ||
855 | { | ||
856 | struct soc_camera_device *icd = vb2_get_drv_priv(vq); | ||
857 | struct soc_camera_host *ici = to_soc_camera_host(icd->parent); | ||
858 | mutex_unlock(&ici->host_lock); | ||
859 | } | ||
860 | EXPORT_SYMBOL(soc_camera_unlock); | ||
861 | |||
862 | static struct v4l2_file_operations soc_camera_fops = { | 846 | static struct v4l2_file_operations soc_camera_fops = { |
863 | .owner = THIS_MODULE, | 847 | .owner = THIS_MODULE, |
864 | .open = soc_camera_open, | 848 | .open = soc_camera_open, |