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

Commit d86c6a8c authored by Dean Anderson's avatar Dean Anderson Committed by Mauro Carvalho Chehab
Browse files

[media] s2255drv: removal of s2255_dmaqueue structure 



Removal of unused and unnecessary s2255dma_queue structure.

Signed-off-by: default avatarDean Anderson <linux-dev@sensoray.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 381d0a40

drivers/media/usb/s2255/s2255drv.c

+10 −19
Original line number Original line Diff line number Diff line 
/*

/*

 *  s2255drv.c - a driver for the Sensoray 2255 USB video capture device

 *  s2255drv.c - a driver for the Sensoray 2255 USB video capture device

 *

 *

 *   Copyright (C) 2007-2013 by Sensoray Company Inc.

 *   Copyright (C) 2007-2014 by Sensoray Company Inc.

 *                              Dean Anderson

 *                              Dean Anderson

 *

 *

 * Some video buffer code based on vivi driver:

 * Some video buffer code based on vivi driver:
@@ -52,7 +52,7 @@ 
#include <media/v4l2-ctrls.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>

#include <media/v4l2-event.h>





#define S2255_VERSION		"1.23.1"

#define S2255_VERSION		"1.24.1"

#define FIRMWARE_FILE_NAME "f2255usb.bin"

#define FIRMWARE_FILE_NAME "f2255usb.bin"





/* default JPEG quality */

/* default JPEG quality */
@@ -178,11 +178,6 @@ struct s2255_bufferi { 
			DEF_FDEC, DEF_BRIGHT, DEF_CONTRAST, DEF_SATURATION, \

			DEF_FDEC, DEF_BRIGHT, DEF_CONTRAST, DEF_SATURATION, \

			DEF_HUE, 0, DEF_USB_BLOCK, 0}

			DEF_HUE, 0, DEF_USB_BLOCK, 0}





struct s2255_dmaqueue {

	struct list_head	active;

	struct s2255_dev	*dev;

};



/* for firmware loading, fw_state */

/* for firmware loading, fw_state */

#define S2255_FW_NOTLOADED	0

#define S2255_FW_NOTLOADED	0

#define S2255_FW_LOADED_DSPWAIT	1

#define S2255_FW_LOADED_DSPWAIT	1
@@ -223,7 +218,7 @@ struct s2255_channel { 
	struct v4l2_ctrl_handler hdl;

	struct v4l2_ctrl_handler hdl;

	struct v4l2_ctrl	*jpegqual_ctrl;

	struct v4l2_ctrl	*jpegqual_ctrl;

	int			resources;

	int			resources;

	struct s2255_dmaqueue	vidq;

	struct list_head        buf_list;

	struct s2255_bufferi	buffer;

	struct s2255_bufferi	buffer;

	struct s2255_mode	mode;

	struct s2255_mode	mode;

	v4l2_std_id		std;

	v4l2_std_id		std;
@@ -574,18 +569,17 @@ static void s2255_fwchunk_complete(struct urb *urb) 




static int s2255_got_frame(struct s2255_channel *channel, int jpgsize)

static int s2255_got_frame(struct s2255_channel *channel, int jpgsize)

{

{

	struct s2255_dmaqueue *dma_q = &channel->vidq;

	struct s2255_buffer *buf;

	struct s2255_buffer *buf;

	struct s2255_dev *dev = to_s2255_dev(channel->vdev.v4l2_dev);

	struct s2255_dev *dev = to_s2255_dev(channel->vdev.v4l2_dev);

	unsigned long flags = 0;

	unsigned long flags = 0;

	int rc = 0;

	int rc = 0;

	spin_lock_irqsave(&dev->slock, flags);

	spin_lock_irqsave(&dev->slock, flags);

	if (list_empty(&dma_q->active)) {

	if (list_empty(&channel->buf_list)) {

		dprintk(dev, 1, "No active queue to serve\n");

		dprintk(dev, 1, "No active queue to serve\n");

		rc = -1;

		rc = -1;

		goto unlock;

		goto unlock;

	}

	}

	buf = list_entry(dma_q->active.next,

	buf = list_entry(channel->buf_list.next,

			 struct s2255_buffer, vb.queue);

			 struct s2255_buffer, vb.queue);

	list_del(&buf->vb.queue);

	list_del(&buf->vb.queue);

	v4l2_get_timestamp(&buf->vb.ts);

	v4l2_get_timestamp(&buf->vb.ts);
@@ -747,10 +741,9 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) 
	struct s2255_buffer *buf = container_of(vb, struct s2255_buffer, vb);

	struct s2255_buffer *buf = container_of(vb, struct s2255_buffer, vb);

	struct s2255_fh *fh = vq->priv_data;

	struct s2255_fh *fh = vq->priv_data;

	struct s2255_channel *channel = fh->channel;

	struct s2255_channel *channel = fh->channel;

	struct s2255_dmaqueue *vidq = &channel->vidq;

	dprintk(fh->dev, 1, "%s\n", __func__);

	dprintk(fh->dev, 1, "%s\n", __func__);

	buf->vb.state = VIDEOBUF_QUEUED;

	buf->vb.state = VIDEOBUF_QUEUED;

	list_add_tail(&buf->vb.queue, &vidq->active);

	list_add_tail(&buf->vb.queue, &channel->buf_list);

}

}





static void buffer_release(struct videobuf_queue *vq,

static void buffer_release(struct videobuf_queue *vq,
@@ -1679,11 +1672,10 @@ static int __s2255_open(struct file *file) 
	}

	}

	dprintk(dev, 1, "%s: dev=%s type=%s\n", __func__,

	dprintk(dev, 1, "%s: dev=%s type=%s\n", __func__,

		video_device_node_name(vdev), v4l2_type_names[type]);

		video_device_node_name(vdev), v4l2_type_names[type]);

	dprintk(dev, 2, "%s: fh=0x%08lx, dev=0x%08lx, vidq=0x%08lx\n", __func__,

	dprintk(dev, 2, "%s: fh=0x%08lx, dev=0x%08lx\n", __func__,

		(unsigned long)fh, (unsigned long)dev,

		(unsigned long)fh, (unsigned long)dev);

		(unsigned long)&channel->vidq);

	dprintk(dev, 4, "%s: list_empty active=%d\n", __func__,

	dprintk(dev, 4, "%s: list_empty active=%d\n", __func__,

		list_empty(&channel->vidq.active));

		list_empty(&channel->buf_list));

	videobuf_queue_vmalloc_init(&fh->vb_vidq, &s2255_video_qops,

	videobuf_queue_vmalloc_init(&fh->vb_vidq, &s2255_video_qops,

				    NULL, &dev->slock,

				    NULL, &dev->slock,

				    fh->type,

				    fh->type,
@@ -1876,7 +1868,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev) 
	/* register 4 video devices */

	/* register 4 video devices */

	for (i = 0; i < MAX_CHANNELS; i++) {

	for (i = 0; i < MAX_CHANNELS; i++) {

		channel = &dev->channel[i];

		channel = &dev->channel[i];

		INIT_LIST_HEAD(&channel->vidq.active);

		INIT_LIST_HEAD(&channel->buf_list);





		v4l2_ctrl_handler_init(&channel->hdl, 6);

		v4l2_ctrl_handler_init(&channel->hdl, 6);

		v4l2_ctrl_new_std(&channel->hdl, &s2255_ctrl_ops,

		v4l2_ctrl_new_std(&channel->hdl, &s2255_ctrl_ops,
@@ -1901,7 +1893,6 @@ static int s2255_probe_v4l(struct s2255_dev *dev) 
			dev_err(&dev->udev->dev, "couldn't register control\n");

			dev_err(&dev->udev->dev, "couldn't register control\n");

			break;

			break;

		}

		}

		channel->vidq.dev = dev;

		/* register 4 video devices */

		/* register 4 video devices */

		channel->vdev = template;

		channel->vdev = template;

		channel->vdev.ctrl_handler = &channel->hdl;

		channel->vdev.ctrl_handler = &channel->hdl;