Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit b6a633c1 authored Dec 25, 2010 by Guennadi Liakhovetski Committed by Mauro Carvalho Chehab Dec 30, 2010

[media] v4l: soc-camera: switch to .unlocked_ioctl



Use the V4L mutex infrastructure in soc-camera core and drivers and switch to
.unlocked_ioctl.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent c85bb69a

drivers/media/video/mx1_camera.c

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -382,10 +382,9 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q,
	struct mx1_camera_dev *pcdev = ici->priv;		struct mx1_camera_dev *pcdev = ici->priv;

	videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->dev.parent,		videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->dev.parent,
	&pcdev->lock,		&pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
	V4L2_BUF_TYPE_VIDEO_CAPTURE,
	V4L2_FIELD_NONE,		V4L2_FIELD_NONE,
	sizeof(struct mx1_buffer), icd, NULL);		sizeof(struct mx1_buffer), icd, &icd->video_lock);
	}		}

	static int mclk_get_divisor(struct mx1_camera_dev *pcdev)		static int mclk_get_divisor(struct mx1_camera_dev *pcdev)

drivers/media/video/mx2_camera.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -683,7 +683,8 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q,

	videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev,		videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev,
	&pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,		&pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
	V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd, NULL);		V4L2_FIELD_NONE, sizeof(struct mx2_buffer),
			icd, &icd->video_lock);
	}		}

	#define MX2_BUS_FLAGS (SOCAM_DATAWIDTH_8 \| \		#define MX2_BUS_FLAGS (SOCAM_DATAWIDTH_8 \| \

drivers/media/video/mx3_camera.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -443,7 +443,7 @@ static void mx3_camera_init_videobuf(struct videobuf_queue *q,
	V4L2_BUF_TYPE_VIDEO_CAPTURE,		V4L2_BUF_TYPE_VIDEO_CAPTURE,
	V4L2_FIELD_NONE,		V4L2_FIELD_NONE,
	sizeof(struct mx3_camera_buffer), icd,		sizeof(struct mx3_camera_buffer), icd,
	NULL);		&icd->video_lock);
	}		}

	/* First part of ipu_csi_init_interface() */		/* First part of ipu_csi_init_interface() */

drivers/media/video/omap1_camera.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1365,12 +1365,12 @@ static void omap1_cam_init_videobuf(struct videobuf_queue *q,
	videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,		videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,
	icd->dev.parent, &pcdev->lock,		icd->dev.parent, &pcdev->lock,
	V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,		V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
	sizeof(struct omap1_cam_buf), icd, NULL);		sizeof(struct omap1_cam_buf), icd, &icd->video_lock);
	else		else
	videobuf_queue_sg_init(q, &omap1_videobuf_ops,		videobuf_queue_sg_init(q, &omap1_videobuf_ops,
	icd->dev.parent, &pcdev->lock,		icd->dev.parent, &pcdev->lock,
	V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,		V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
	sizeof(struct omap1_cam_buf), icd, NULL);		sizeof(struct omap1_cam_buf), icd, &icd->video_lock);

	/* use videobuf mode (auto)selected with the module parameter */		/* use videobuf mode (auto)selected with the module parameter */
	pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;		pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;

drivers/media/video/pxa_camera.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -852,7 +852,7 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q,
	*/		*/
	videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock,		videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock,
	V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,		V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
	sizeof(struct pxa_buffer), icd, NULL);		sizeof(struct pxa_buffer), icd, &icd->video_lock);
	}		}

	static u32 mclk_get_divisor(struct platform_device *pdev,		static u32 mclk_get_divisor(struct platform_device *pdev,