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

media: saa7146: drop 'dev' and 'resources' from struct saa7146_fh 



Instead use vv->resources and video_drvdata(file) to
obtain this information.

This prepares for the vb2 conversion later when saa7146_fh is
dropped completely.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 999a9fbf

drivers/media/common/saa7146/saa7146_fops.c

+14 −17
Original line number Diff line number Diff line
@@ -7,12 +7,11 @@ 
/****************************************************************************/

/* resource management functions, shamelessly stolen from saa7134 driver */



int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit)

int saa7146_res_get(struct saa7146_dev *dev, unsigned int bit)

{

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;



	if (fh->resources & bit) {

	if (vv->resources & bit) {

		DEB_D("already allocated! want: 0x%02x, cur:0x%02x\n",

		      bit, vv->resources);

		/* have it already allocated */
@@ -27,20 +26,17 @@ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit) 
		return 0;

	}

	/* it's free, grab it */

	fh->resources |= bit;

	vv->resources |= bit;

	DEB_D("res: get 0x%02x, cur:0x%02x\n", bit, vv->resources);

	return 1;

}



void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)

void saa7146_res_free(struct saa7146_dev *dev, unsigned int bits)

{

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;



	BUG_ON((fh->resources & bits) != bits);

	WARN_ON((vv->resources & bits) != bits);



	fh->resources &= ~bits;

	vv->resources &= ~bits;

	DEB_D("res: put 0x%02x, cur:0x%02x\n", bits, vv->resources);

}
@@ -221,7 +217,6 @@ static int fops_open(struct file *file) 
	v4l2_fh_init(&fh->fh, vdev);



	file->private_data = &fh->fh;

	fh->dev = dev;



	if (vdev->vfl_type == VFL_TYPE_VBI) {

		DEB_S("initializing vbi...\n");
@@ -257,8 +252,8 @@ static int fops_open(struct file *file) 
static int fops_release(struct file *file)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh  *fh  = file->private_data;

	struct saa7146_dev *dev = fh->dev;



	DEB_EE("file:%p\n", file);
@@ -287,6 +282,7 @@ static int fops_release(struct file *file) 
static int fops_mmap(struct file *file, struct vm_area_struct * vma)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct videobuf_queue *q;

	int res;
@@ -301,7 +297,7 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) 
	case VFL_TYPE_VBI: {

		DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",

		       file, vma);

		if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)

		if (dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)

			return -ENODEV;

		q = &fh->vbi_q;

		break;
@@ -320,6 +316,7 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) 
static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct videobuf_buffer *buf = NULL;

	struct videobuf_queue *q;
@@ -328,7 +325,7 @@ static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait) 
	DEB_EE("file:%p, poll:%p\n", file, wait);



	if (vdev->vfl_type == VFL_TYPE_VBI) {

		if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)

		if (dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)

			return res | EPOLLOUT | EPOLLWRNORM;

		if( 0 == fh->vbi_q.streaming )

			return res | videobuf_poll_stream(file, &fh->vbi_q, wait);
@@ -370,7 +367,7 @@ static __poll_t fops_poll(struct file *file, struct poll_table_struct *wait) 
static ssize_t fops_read(struct file *file, char __user *data, size_t count, loff_t *ppos)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = video_drvdata(file);

	int ret;



	switch (vdev->vfl_type) {
@@ -385,7 +382,7 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof 
		DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n",

		       file, data, (unsigned long)count);

*/

		if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE) {

		if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE) {

			if (mutex_lock_interruptible(vdev->lock))

				return -ERESTARTSYS;

			ret = saa7146_vbi_uops.read(file, data, count, ppos);
@@ -401,17 +398,17 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof 
static ssize_t fops_write(struct file *file, const char __user *data, size_t count, loff_t *ppos)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = video_drvdata(file);

	int ret;



	switch (vdev->vfl_type) {

	case VFL_TYPE_VIDEO:

		return -EINVAL;

	case VFL_TYPE_VBI:

		if (fh->dev->ext_vv_data->vbi_fops.write) {

		if (dev->ext_vv_data->vbi_fops.write) {

			if (mutex_lock_interruptible(vdev->lock))

				return -ERESTARTSYS;

			ret = fh->dev->ext_vv_data->vbi_fops.write(file, data, count, ppos);

			ret = dev->ext_vv_data->vbi_fops.write(file, data, count, ppos);

			mutex_unlock(vdev->lock);

			return ret;

		}

drivers/media/common/saa7146/saa7146_vbi.c

+9 −12
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ static int buffer_activate(struct saa7146_dev *dev, 
static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,enum v4l2_field field)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;



	int err = 0;
@@ -289,8 +288,7 @@ static int buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned 
static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;
@@ -301,8 +299,7 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) 
static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh   = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;



	DEB_VBI("vb:%p\n", vb);
@@ -320,7 +317,7 @@ static const struct videobuf_queue_ops vbi_qops = { 


static void vbi_stop(struct saa7146_fh *fh, struct file *file)

{

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	unsigned long flags;

	DEB_VBI("dev:%p, fh:%p\n", dev, fh);
@@ -353,8 +350,8 @@ static void vbi_read_timeout(struct timer_list *t) 
{

	struct saa7146_vv *vv = from_timer(vv, t, vbi_read_timeout);

	struct file *file = vv->vbi_read_timeout_file;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;



	DEB_VBI("dev:%p, fh:%p\n", dev, fh);
@@ -376,14 +373,14 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 
static int vbi_open(struct saa7146_dev *dev, struct file *file)

{

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_vv *vv = fh->dev->vv_data;

	struct saa7146_vv *vv = dev->vv_data;



	u32 arbtr_ctrl	= saa7146_read(dev, PCI_BT_V1);

	int ret = 0;



	DEB_VBI("dev:%p, fh:%p\n", dev, fh);



	ret = saa7146_res_get(fh, RESOURCE_DMA3_BRS);

	ret = saa7146_res_get(dev, RESOURCE_DMA3_BRS);

	if (0 == ret) {

		DEB_S("cannot get vbi RESOURCE_DMA3_BRS resource\n");

		return -EBUSY;
@@ -431,7 +428,7 @@ static void vbi_close(struct saa7146_dev *dev, struct file *file) 
	if( fh == vv->vbi_streaming ) {

		vbi_stop(fh, file);

	}

	saa7146_res_free(fh, RESOURCE_DMA3_BRS);

	saa7146_res_free(dev, RESOURCE_DMA3_BRS);

}



static void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
@@ -456,7 +453,7 @@ static void vbi_irq_done(struct saa7146_dev *dev, unsigned long status) 
static ssize_t vbi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)

{

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	ssize_t ret = 0;

drivers/media/common/saa7146/saa7146_video.c

+28 −32
Original line number Diff line number Diff line
@@ -211,9 +211,8 @@ static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *bu 
/********************************************************************************/

/* file operations */



static int video_begin(struct saa7146_fh *fh)

static int video_begin(struct saa7146_dev *dev, struct saa7146_fh *fh)

{

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_format *fmt = NULL;

	unsigned int resource;
@@ -241,7 +240,7 @@ static int video_begin(struct saa7146_fh *fh) 
		resource = RESOURCE_DMA1_HPS;

	}



	ret = saa7146_res_get(fh, resource);

	ret = saa7146_res_get(dev, resource);

	if (0 == ret) {

		DEB_S("cannot get capture resource %d\n", resource);

		return -EBUSY;
@@ -259,9 +258,8 @@ static int video_begin(struct saa7146_fh *fh) 
	return 0;

}



static int video_end(struct saa7146_fh *fh, struct file *file)

static int video_end(struct saa7146_dev *dev, struct saa7146_fh *fh)

{

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_dmaqueue *q = &vv->video_dmaq;

	struct saa7146_format *fmt = NULL;
@@ -311,14 +309,14 @@ static int video_end(struct saa7146_fh *fh, struct file *file) 
	vv->video_fh = NULL;

	vv->video_status = 0;



	saa7146_res_free(fh, resource);

	saa7146_res_free(dev, resource);



	return 0;

}



static int vidioc_querycap(struct file *file, void *fh, struct v4l2_capability *cap)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);



	strscpy((char *)cap->driver, "saa7146 v4l2", sizeof(cap->driver));

	strscpy((char *)cap->card, dev->ext->name, sizeof(cap->card));
@@ -391,7 +389,7 @@ int saa7146_s_ctrl(struct v4l2_ctrl *ctrl) 
static int vidioc_g_parm(struct file *file, void *fh,

		struct v4l2_streamparm *parm)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;



	if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -404,7 +402,7 @@ static int vidioc_g_parm(struct file *file, void *fh, 


static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;



	f->fmt.pix = vv->video_fmt;
@@ -413,7 +411,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format 


static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;



	f->fmt.vbi = vv->vbi_fmt;
@@ -422,7 +420,7 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format 


static int vidioc_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_format *fmt;

	enum v4l2_field field;
@@ -487,8 +485,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_forma 


static int vidioc_s_fmt_vid_cap(struct file *file, void *__fh, struct v4l2_format *f)

{

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = __fh;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;

	int err;
@@ -508,7 +506,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *__fh, struct v4l2_forma 


static int vidioc_g_std(struct file *file, void *fh, v4l2_std_id *norm)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;



	*norm = vv->standard->id;
@@ -535,7 +533,7 @@ static int vidioc_g_std(struct file *file, void *fh, v4l2_std_id *norm) 


static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id id)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	int found = 0;

	int i;
@@ -612,12 +610,13 @@ static int vidioc_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf) 


static int vidioc_streamon(struct file *file, void *__fh, enum v4l2_buf_type type)

{

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = __fh;

	int err;



	DEB_D("VIDIOC_STREAMON, type:%d\n", type);



	err = video_begin(fh);

	err = video_begin(dev, fh);

	if (err)

		return err;

	if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -629,8 +628,8 @@ static int vidioc_streamon(struct file *file, void *__fh, enum v4l2_buf_type typ 


static int vidioc_streamoff(struct file *file, void *__fh, enum v4l2_buf_type type)

{

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = __fh;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;

	int err;
@@ -656,9 +655,9 @@ static int vidioc_streamoff(struct file *file, void *__fh, enum v4l2_buf_type ty 
		err = videobuf_streamoff(&fh->vbi_q);

	if (0 != err) {

		DEB_D("warning: videobuf_streamoff() failed\n");

		video_end(fh, file);

		video_end(dev, fh);

	} else {

		err = video_end(fh, file);

		err = video_end(dev, fh);

	}

	return err;

}
@@ -727,8 +726,7 @@ static int buffer_prepare(struct videobuf_queue *q, 
			  struct videobuf_buffer *vb, enum v4l2_field field)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;

	int size,err = 0;
@@ -808,8 +806,8 @@ static int buffer_prepare(struct videobuf_queue *q, 
static int buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_vv *vv = fh->dev->vv_data;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;



	if (0 == *count || *count > MAX_SAA7146_CAPTURE_BUFFERS)

		*count = MAX_SAA7146_CAPTURE_BUFFERS;
@@ -829,20 +827,18 @@ static int buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned 
static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_vv *vv = dev->vv_data;

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;



	DEB_CAP("vbuf:%p\n", vb);

	saa7146_buffer_queue(fh->dev, &vv->video_dmaq, buf);

	saa7146_buffer_queue(dev, &vv->video_dmaq, buf);

}



static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)

{

	struct file *file = q->priv_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_buf *buf = (struct saa7146_buf *)vb;



	DEB_CAP("vbuf:%p\n", vb);
@@ -900,7 +896,7 @@ static void video_close(struct saa7146_dev *dev, struct file *file) 
	struct videobuf_queue *q = &fh->video_q;



	if (IS_CAPTURE_ACTIVE(fh) != 0)

		video_end(fh, file);

		video_end(dev, fh);



	videobuf_stop(q);

	/* hmm, why is this function declared void? */
@@ -926,8 +922,8 @@ static void video_irq_done(struct saa7146_dev *dev, unsigned long st) 


static ssize_t video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)

{

	struct saa7146_dev *dev = video_drvdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;

	struct saa7146_vv *vv = dev->vv_data;

	ssize_t ret = 0;
@@ -943,7 +939,7 @@ static ssize_t video_read(struct file *file, char __user *data, size_t count, lo 
		return -EBUSY;

	}



	ret = video_begin(fh);

	ret = video_begin(dev, fh);

	if( 0 != ret) {

		goto out;

	}
@@ -951,9 +947,9 @@ static ssize_t video_read(struct file *file, char __user *data, size_t count, lo 
	ret = videobuf_read_one(&fh->video_q , data, count, ppos,

				file->f_flags & O_NONBLOCK);

	if (ret != 0) {

		video_end(fh, file);

		video_end(dev, fh);

	} else {

		ret = video_end(fh, file);

		ret = video_end(dev, fh);

	}

out:

	return ret;

drivers/media/pci/saa7146/hexium_gemini.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) 


static int vidioc_g_input(struct file *file, void *fh, unsigned int *input)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct hexium *hexium = (struct hexium *) dev->ext_priv;



	*input = hexium->cur_input;
@@ -226,7 +226,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *input) 


static int vidioc_s_input(struct file *file, void *fh, unsigned int input)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct hexium *hexium = (struct hexium *) dev->ext_priv;



	DEB_EE("VIDIOC_S_INPUT %d\n", input);

drivers/media/pci/saa7146/hexium_orion.c

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) 


static int vidioc_g_input(struct file *file, void *fh, unsigned int *input)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct hexium *hexium = (struct hexium *) dev->ext_priv;



	*input = hexium->cur_input;
@@ -337,7 +337,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *input) 


static int vidioc_s_input(struct file *file, void *fh, unsigned int input)

{

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;

	struct saa7146_dev *dev = video_drvdata(file);

	struct hexium *hexium = (struct hexium *) dev->ext_priv;



	if (input >= HEXIUM_INPUTS)