Commit dd669e90 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: remove struct soc_camera_device::video_lock 



Currently soc-camera has a per-device node lock, used for video operations
and a per-host lock for code paths, modifying host's pipeline. Manipulating
the two locks increases complexity and doesn't bring any advantages. This
patch removes the per-device lock and uses the per-host lock for all
operations.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8a97d4c1

drivers/media/platform/soc_camera/atmel-isi.c

+2 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static int isi_camera_get_formats(struct soc_camera_device *icd, 
	return formats;

}



/* Called with .video_lock held */

/* Called with .host_lock held */

static int isi_camera_add_device(struct soc_camera_device *icd)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
@@ -770,7 +770,7 @@ static int isi_camera_add_device(struct soc_camera_device *icd) 
		 icd->devnum);

	return 0;

}

/* Called with .video_lock held */

/* Called with .host_lock held */

static void isi_camera_remove_device(struct soc_camera_device *icd)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/platform/soc_camera/mx1_camera.c

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/mutex.h>

#include <linux/platform_device.h>

#include <linux/sched.h>

#include <linux/slab.h>
@@ -373,7 +372,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q, 
	videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->parent,

				&pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,

				V4L2_FIELD_NONE,

				sizeof(struct mx1_buffer), icd, &icd->video_lock);

				sizeof(struct mx1_buffer), icd, &icd->host_lock);

}



static int mclk_get_divisor(struct mx1_camera_dev *pcdev)

drivers/media/platform/soc_camera/mx2_camera.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/time.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/mutex.h>

#include <linux/clk.h>



#include <media/v4l2-common.h>

drivers/media/platform/soc_camera/mx3_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam, 
		clk_set_rate(mx3_cam->clk, rate);

}



/* Called with .video_lock held */

/* Called with .host_lock held */

static int mx3_camera_add_device(struct soc_camera_device *icd)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
@@ -530,7 +530,7 @@ static int mx3_camera_add_device(struct soc_camera_device *icd) 
	return 0;

}



/* Called with .video_lock held */

/* Called with .host_lock held */

static void mx3_camera_remove_device(struct soc_camera_device *icd)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/platform/soc_camera/omap1_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -1383,12 +1383,12 @@ static void omap1_cam_init_videobuf(struct videobuf_queue *q, 
		videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,

				icd->parent, &pcdev->lock,

				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,

				sizeof(struct omap1_cam_buf), icd, &icd->video_lock);

				sizeof(struct omap1_cam_buf), icd, &icd->host_lock);

	else

		videobuf_queue_sg_init(q, &omap1_videobuf_ops,

				icd->parent, &pcdev->lock,

				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,

				sizeof(struct omap1_cam_buf), icd, &icd->video_lock);

				sizeof(struct omap1_cam_buf), icd, &icd->host_lock);



	/* use videobuf mode (auto)selected with the module parameter */

	pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;

CRA Git | Maintained and supported by SUSTech CRA and CCSE