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

Commit 4c1d0f73 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx25821: group all fmt functions together 



No other changes, just function reordering.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1f198870

drivers/media/pci/cx25821/cx25821-video.c

+43 −41
Original line number Original line Diff line number Diff line
@@ -551,6 +551,19 @@ static int video_release(struct file *file) 
}

}





/* VIDEO IOCTLS */

/* VIDEO IOCTLS */



static int cx25821_vidioc_enum_fmt_vid_cap(struct file *file, void *priv,

			    struct v4l2_fmtdesc *f)

{

	if (unlikely(f->index >= ARRAY_SIZE(formats)))

		return -EINVAL;



	strlcpy(f->description, formats[f->index].name, sizeof(f->description));

	f->pixelformat = formats[f->index].fourcc;



	return 0;

}



static int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv,

static int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv,

				 struct v4l2_format *f)

				 struct v4l2_format *f)

{

{
@@ -607,35 +620,6 @@ static int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv, 




	return 0;

	return 0;

}

}

static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)

{

	struct cx25821_channel *chan = video_drvdata(file);



	if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (chan->streaming_fh && chan->streaming_fh != priv)

		return -EBUSY;

	chan->streaming_fh = priv;



	return videobuf_streamon(&chan->vidq);

}



static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)

{

	struct cx25821_channel *chan = video_drvdata(file);



	if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (chan->streaming_fh && chan->streaming_fh != priv)

		return -EBUSY;

	if (chan->streaming_fh == NULL)

		return 0;



	chan->streaming_fh = NULL;

	return videobuf_streamoff(&chan->vidq);

}





static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,

static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,

				struct v4l2_format *f)

				struct v4l2_format *f)
@@ -673,6 +657,36 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	return 0;

	return 0;

}

}





static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)

{

	struct cx25821_channel *chan = video_drvdata(file);



	if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (chan->streaming_fh && chan->streaming_fh != priv)

		return -EBUSY;

	chan->streaming_fh = priv;



	return videobuf_streamon(&chan->vidq);

}



static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)

{

	struct cx25821_channel *chan = video_drvdata(file);



	if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (chan->streaming_fh && chan->streaming_fh != priv)

		return -EBUSY;

	if (chan->streaming_fh == NULL)

		return 0;



	chan->streaming_fh = NULL;

	return videobuf_streamoff(&chan->vidq);

}



static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)

static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)

{

{

	int ret_val = 0;

	int ret_val = 0;
@@ -718,18 +732,6 @@ static int cx25821_vidioc_querycap(struct file *file, void *priv, 
	return 0;

	return 0;

}

}





static int cx25821_vidioc_enum_fmt_vid_cap(struct file *file, void *priv,

			    struct v4l2_fmtdesc *f)

{

	if (unlikely(f->index >= ARRAY_SIZE(formats)))

		return -EINVAL;



	strlcpy(f->description, formats[f->index].name, sizeof(f->description));

	f->pixelformat = formats[f->index].fourcc;



	return 0;

}



static int cx25821_vidioc_reqbufs(struct file *file, void *priv,

static int cx25821_vidioc_reqbufs(struct file *file, void *priv,

			   struct v4l2_requestbuffers *p)

			   struct v4l2_requestbuffers *p)

{

{