From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
All fields in solo_dev_fh do not belong there since they refer to global
properties. After moving all these fields to solo_dev the solo_dev_fh
struct can be removed completely.
Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---
drivers/staging/media/solo6x10/solo6x10.h | 7 +
drivers/staging/media/solo6x10/v4l2.c | 231 ++++++++++++-----------------
2 files changed, 101 insertions(+), 137 deletions(-)
diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
index 82be88c..361f41f 100644
--- a/drivers/staging/media/solo6x10/solo6x10.h
+++ b/drivers/staging/media/solo6x10/solo6x10.h
@@ -250,6 +250,13 @@ struct solo_dev {
void *vh_buf;
dma_addr_t vh_dma;
int vh_size;
+
+ /* Buffer handling */
+ struct videobuf_queue vidq;
+ struct task_struct *kthread;
+ spinlock_t slock;
+ int old_write;
+ struct list_head vidq_active;
};
static inline u32 solo_reg_read(struct solo_dev *solo_dev, int reg)
diff --git a/drivers/staging/media/solo6x10/v4l2.c b/drivers/staging/media/solo6x10/v4l2.c
index fe09180..64595ef 100644
--- a/drivers/staging/media/solo6x10/v4l2.c
+++ b/drivers/staging/media/solo6x10/v4l2.c
@@ -44,17 +44,6 @@
#define MIN_VID_BUFFERS 2
-/* Simple file handle */
-struct solo_filehandle {
- struct v4l2_fh fh;
- struct solo_dev *solo_dev;
- struct videobuf_queue vidq;
- struct task_struct *kthread;
- spinlock_t slock;
- int old_write;
- struct list_head vidq_active;
-};
-
static inline void erase_on(struct solo_dev *solo_dev)
{
solo_reg_write(solo_dev, SOLO_VO_DISP_ERASE, SOLO_VO_DISP_ERASE_ON);
@@ -202,10 +191,9 @@ static int solo_v4l2_set_ch(struct solo_dev *solo_dev, u8 ch)
return 0;
}
-static void solo_fillbuf(struct solo_filehandle *fh,
+static void solo_fillbuf(struct solo_dev *solo_dev,
struct videobuf_buffer *vb)
{
- struct solo_dev *solo_dev = fh->solo_dev;
dma_addr_t vbuf;
unsigned int fdma_addr;
int error = -1;
@@ -216,7 +204,7 @@ static void solo_fillbuf(struct solo_filehandle *fh,
goto finish_buf;
if (erase_off(solo_dev)) {
- void *p = videobuf_queue_to_vaddr(&fh->vidq, vb);
+ void *p = videobuf_queue_to_vaddr(&solo_dev->vidq, vb);
int image_size = solo_image_size(solo_dev);
for (i = 0; i < image_size; i += 2) {
((u8 *)p)[i] = 0x80;
@@ -224,7 +212,7 @@ static void solo_fillbuf(struct solo_filehandle *fh,
}
error = 0;
} else {
- fdma_addr = SOLO_DISP_EXT_ADDR + (fh->old_write *
+ fdma_addr = SOLO_DISP_EXT_ADDR + (solo_dev->old_write *
(SOLO_HW_BPL * solo_vlines(solo_dev)));
error = solo_p2m_dma_t(solo_dev, 0, vbuf, fdma_addr,
@@ -243,7 +231,7 @@ finish_buf:
wake_up(&vb->done);
}
-static void solo_thread_try(struct solo_filehandle *fh)
+static void solo_thread_try(struct solo_dev *solo_dev)
{
struct videobuf_buffer *vb;
@@ -253,38 +241,37 @@ static void solo_thread_try(struct solo_filehandle *fh)
unsigned int cur_write;
cur_write = SOLO_VI_STATUS0_PAGE(
- solo_reg_read(fh->solo_dev, SOLO_VI_STATUS0));
- if (cur_write == fh->old_write)
+ solo_reg_read(solo_dev, SOLO_VI_STATUS0));
+ if (cur_write == solo_dev->old_write)
return;
- spin_lock(&fh->slock);
+ spin_lock(&solo_dev->slock);
- if (list_empty(&fh->vidq_active))
+ if (list_empty(&solo_dev->vidq_active))
break;
- vb = list_first_entry(&fh->vidq_active, struct videobuf_buffer,
+ vb = list_first_entry(&solo_dev->vidq_active, struct videobuf_buffer,
queue);
if (!waitqueue_active(&vb->done))
break;
- fh->old_write = cur_write;
+ solo_dev->old_write = cur_write;
list_del(&vb->queue);
vb->state = VIDEOBUF_ACTIVE;
- spin_unlock(&fh->slock);
+ spin_unlock(&solo_dev->slock);
- solo_fillbuf(fh, vb);
+ solo_fillbuf(solo_dev, vb);
}
- assert_spin_locked(&fh->slock);
- spin_unlock(&fh->slock);
+ assert_spin_locked(&solo_dev->slock);
+ spin_unlock(&solo_dev->slock);
}
static int solo_thread(void *data)
{
- struct solo_filehandle *fh = data;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = data;
DECLARE_WAITQUEUE(wait, current);
set_freezable();
@@ -294,7 +281,7 @@ static int solo_thread(void *data)
long timeout = schedule_timeout_interruptible(HZ);
if (timeout == -ERESTARTSYS || kthread_should_stop())
break;
- solo_thread_try(fh);
+ solo_thread_try(solo_dev);
try_to_freeze();
}
@@ -303,40 +290,39 @@ static int solo_thread(void *data)
return 0;
}
-static int solo_start_thread(struct solo_filehandle *fh)
+static int solo_start_thread(struct solo_dev *solo_dev)
{
int ret = 0;
- if (atomic_inc_return(&fh->solo_dev->disp_users) == 1)
- solo_irq_on(fh->solo_dev, SOLO_IRQ_VIDEO_IN);
+ if (atomic_inc_return(&solo_dev->disp_users) == 1)
+ solo_irq_on(solo_dev, SOLO_IRQ_VIDEO_IN);
- fh->kthread = kthread_run(solo_thread, fh, SOLO6X10_NAME "_disp");
+ solo_dev->kthread = kthread_run(solo_thread, solo_dev, SOLO6X10_NAME "_disp");
- if (IS_ERR(fh->kthread)) {
- ret = PTR_ERR(fh->kthread);
- fh->kthread = NULL;
+ if (IS_ERR(solo_dev->kthread)) {
+ ret = PTR_ERR(solo_dev->kthread);
+ solo_dev->kthread = NULL;
}
return ret;
}
-static void solo_stop_thread(struct solo_filehandle *fh)
+static void solo_stop_thread(struct solo_dev *solo_dev)
{
- if (!fh->kthread)
+ if (!solo_dev->kthread)
return;
- kthread_stop(fh->kthread);
- fh->kthread = NULL;
+ kthread_stop(solo_dev->kthread);
+ solo_dev->kthread = NULL;
- if (atomic_dec_return(&fh->solo_dev->disp_users) == 0)
- solo_irq_off(fh->solo_dev, SOLO_IRQ_VIDEO_IN);
+ if (atomic_dec_return(&solo_dev->disp_users) == 0)
+ solo_irq_off(solo_dev, SOLO_IRQ_VIDEO_IN);
}
static int solo_buf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
{
- struct solo_filehandle *fh = vq->priv_data;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = vq->priv_data;
*size = solo_image_size(solo_dev);
@@ -349,8 +335,7 @@ static int solo_buf_setup(struct videobuf_queue *vq, unsigned int *count,
static int solo_buf_prepare(struct videobuf_queue *vq,
struct videobuf_buffer *vb, enum v4l2_field field)
{
- struct solo_filehandle *fh = vq->priv_data;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = vq->priv_data;
vb->size = solo_image_size(solo_dev);
if (vb->baddr != 0 && vb->bsize < vb->size)
@@ -378,11 +363,10 @@ static int solo_buf_prepare(struct videobuf_queue *vq,
static void solo_buf_queue(struct videobuf_queue *vq,
struct videobuf_buffer *vb)
{
- struct solo_filehandle *fh = vq->priv_data;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = vq->priv_data;
vb->state = VIDEOBUF_QUEUED;
- list_add_tail(&vb->queue, &fh->vidq_active);
+ list_add_tail(&vb->queue, &solo_dev->vidq_active);
wake_up_interruptible(&solo_dev->disp_thread_wait);
}
@@ -403,84 +387,45 @@ static const struct videobuf_queue_ops solo_video_qops = {
static unsigned int solo_v4l2_poll(struct file *file,
struct poll_table_struct *wait)
{
- struct solo_filehandle *fh = file->private_data;
+ struct solo_dev *solo_dev = video_drvdata(file);
unsigned long req_events = poll_requested_events(wait);
unsigned res = v4l2_ctrl_poll(file, wait);
if (!(req_events & (POLLIN | POLLRDNORM)))
return res;
- return res | videobuf_poll_stream(file, &fh->vidq, wait);
+ return res | videobuf_poll_stream(file, &solo_dev->vidq, wait);
}
static int solo_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
{
- struct solo_filehandle *fh = file->private_data;
-
- return videobuf_mmap_mapper(&fh->vidq, vma);
-}
-
-static int solo_v4l2_open(struct file *file)
-{
struct solo_dev *solo_dev = video_drvdata(file);
- struct solo_filehandle *fh;
- int ret;
- fh = kzalloc(sizeof(*fh), GFP_KERNEL);
- if (fh == NULL)
- return -ENOMEM;
-
- v4l2_fh_init(&fh->fh, video_devdata(file));
- spin_lock_init(&fh->slock);
- INIT_LIST_HEAD(&fh->vidq_active);
- fh->solo_dev = solo_dev;
- file->private_data = fh;
-
- ret = solo_start_thread(fh);
- if (ret) {
- kfree(fh);
- return ret;
- }
-
- videobuf_queue_dma_contig_init(&fh->vidq, &solo_video_qops,
- &solo_dev->pdev->dev, &fh->slock,
- V4L2_BUF_TYPE_VIDEO_CAPTURE,
- V4L2_FIELD_INTERLACED,
- sizeof(struct videobuf_buffer),
- fh, NULL);
- v4l2_fh_add(&fh->fh);
- return 0;
+ return videobuf_mmap_mapper(&solo_dev->vidq, vma);
}
static ssize_t solo_v4l2_read(struct file *file, char __user *data,
size_t count, loff_t *ppos)
{
- struct solo_filehandle *fh = file->private_data;
+ struct solo_dev *solo_dev = video_drvdata(file);
- return videobuf_read_stream(&fh->vidq, data, count, ppos, 0,
+ return videobuf_read_stream(&solo_dev->vidq, data, count, ppos, 0,
file->f_flags & O_NONBLOCK);
}
static int solo_v4l2_release(struct file *file)
{
- struct solo_filehandle *fh = file->private_data;
-
- solo_stop_thread(fh);
-
- videobuf_stop(&fh->vidq);
- videobuf_mmap_free(&fh->vidq);
-
- v4l2_fh_del(&fh->fh);
- v4l2_fh_exit(&fh->fh);
- kfree(fh);
+ struct solo_dev *solo_dev = video_drvdata(file);
- return 0;
+ solo_stop_thread(solo_dev);
+ videobuf_stop(&solo_dev->vidq);
+ videobuf_mmap_free(&solo_dev->vidq);
+ return v4l2_fh_release(file);
}
static int solo_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
- struct solo_filehandle *fh = priv;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = video_drvdata(file);
strcpy(cap->driver, SOLO6X10_NAME);
strcpy(cap->card, "Softlogic 6x10");
@@ -521,8 +466,7 @@ static int solo_enum_ext_input(struct solo_dev *solo_dev,
static int solo_enum_input(struct file *file, void *priv,
struct v4l2_input *input)
{
- struct solo_filehandle *fh = priv;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = video_drvdata(file);
if (input->index >= solo_dev->nr_chans) {
int ret = solo_enum_ext_input(solo_dev, input);
@@ -549,11 +493,11 @@ static int solo_enum_input(struct file *file, void *priv,
static int solo_set_input(struct file *file, void *priv, unsigned int index)
{
- struct solo_filehandle *fh = priv;
- int ret = solo_v4l2_set_ch(fh->solo_dev, index);
+ struct solo_dev *solo_dev = video_drvdata(file);
+ int ret = solo_v4l2_set_ch(solo_dev, index);
if (!ret) {
- while (erase_off(fh->solo_dev))
+ while (erase_off(solo_dev))
/* Do nothing */;
}
@@ -562,9 +506,9 @@ static int solo_set_input(struct file *file, void *priv, unsigned int index)
static int solo_get_input(struct file *file, void *priv, unsigned int *index)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- *index = fh->solo_dev->cur_disp_ch;
+ *index = solo_dev->cur_disp_ch;
return 0;
}
@@ -584,8 +528,7 @@ static int solo_enum_fmt_cap(struct file *file, void *priv,
static int solo_try_fmt_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct solo_filehandle *fh = priv;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = video_drvdata(file);
struct v4l2_pix_format *pix = &f->fmt.pix;
int image_size = solo_image_size(solo_dev);
@@ -605,9 +548,9 @@ static int solo_try_fmt_cap(struct file *file, void *priv,
static int solo_set_fmt_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- if (videobuf_queue_is_busy(&fh->vidq))
+ if (videobuf_queue_is_busy(&solo_dev->vidq))
return -EBUSY;
/* For right now, if it doesn't match our running config,
@@ -618,8 +561,7 @@ static int solo_set_fmt_cap(struct file *file, void *priv,
static int solo_get_fmt_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct solo_filehandle *fh = priv;
- struct solo_dev *solo_dev = fh->solo_dev;
+ struct solo_dev *solo_dev = video_drvdata(file);
struct v4l2_pix_format *pix = &f->fmt.pix;
pix->width = solo_dev->video_hsize;
@@ -637,51 +579,56 @@ static int solo_get_fmt_cap(struct file *file, void *priv,
static int solo_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *req)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- return videobuf_reqbufs(&fh->vidq, req);
+ return videobuf_reqbufs(&solo_dev->vidq, req);
}
static int solo_querybuf(struct file *file, void *priv,
struct v4l2_buffer *buf)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- return videobuf_querybuf(&fh->vidq, buf);
+ return videobuf_querybuf(&solo_dev->vidq, buf);
}
static int solo_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- return videobuf_qbuf(&fh->vidq, buf);
+ return videobuf_qbuf(&solo_dev->vidq, buf);
}
static int solo_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
- return videobuf_dqbuf(&fh->vidq, buf, file->f_flags & O_NONBLOCK);
+ return videobuf_dqbuf(&solo_dev->vidq, buf, file->f_flags & O_NONBLOCK);
}
static int solo_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
+ int ret;
if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
- return videobuf_streamon(&fh->vidq);
+ ret = solo_start_thread(solo_dev);
+ if (ret)
+ return ret;
+
+ return videobuf_streamon(&solo_dev->vidq);
}
static int solo_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
{
- struct solo_filehandle *fh = priv;
+ struct solo_dev *solo_dev = video_drvdata(file);
if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
- return videobuf_streamoff(&fh->vidq);
+ return videobuf_streamoff(&solo_dev->vidq);
}
static int solo_s_std(struct file *file, void *priv, v4l2_std_id *i)
@@ -720,7 +667,7 @@ static int solo_s_ctrl(struct v4l2_ctrl *ctrl)
static const struct v4l2_file_operations solo_v4l2_fops = {
.owner = THIS_MODULE,
- .open = solo_v4l2_open,
+ .open = v4l2_fh_open,
.release = solo_v4l2_release,
.read = solo_v4l2_read,
.poll = solo_v4l2_poll,
@@ -798,21 +745,17 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
solo_dev->vfd->ctrl_handler = &solo_dev->disp_hdl;
set_bit(V4L2_FL_USE_FH_PRIO, &solo_dev->vfd->flags);
- ret = video_register_device(solo_dev->vfd, VFL_TYPE_GRABBER, nr);
- if (ret < 0) {
- video_device_release(solo_dev->vfd);
- solo_dev->vfd = NULL;
- return ret;
- }
-
video_set_drvdata(solo_dev->vfd, solo_dev);
- snprintf(solo_dev->vfd->name, sizeof(solo_dev->vfd->name), "%s (%i)",
- SOLO6X10_NAME, solo_dev->vfd->num);
+ spin_lock_init(&solo_dev->slock);
+ INIT_LIST_HEAD(&solo_dev->vidq_active);
- dev_info(&solo_dev->pdev->dev,
- "Display as /dev/video%d with %d inputs (%d extended)\n",
- solo_dev->vfd->num, solo_dev->nr_chans, solo_dev->nr_ext);
+ videobuf_queue_dma_contig_init(&solo_dev->vidq, &solo_video_qops,
+ &solo_dev->pdev->dev, &solo_dev->slock,
+ V4L2_BUF_TYPE_VIDEO_CAPTURE,
+ V4L2_FIELD_INTERLACED,
+ sizeof(struct videobuf_buffer),
+ solo_dev, NULL);
/* Cycle all the channels and clear */
for (i = 0; i < solo_dev->nr_chans; i++) {
@@ -826,6 +769,20 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
while (erase_off(solo_dev))
/* Do nothing */;
+ ret = video_register_device(solo_dev->vfd, VFL_TYPE_GRABBER, nr);
+ if (ret < 0) {
+ video_device_release(solo_dev->vfd);
+ solo_dev->vfd = NULL;
+ return ret;
+ }
+
+ snprintf(solo_dev->vfd->name, sizeof(solo_dev->vfd->name), "%s (%i)",
+ SOLO6X10_NAME, solo_dev->vfd->num);
+
+ dev_info(&solo_dev->pdev->dev, "Display as /dev/video%d with "
+ "%d inputs (%d extended)\n", solo_dev->vfd->num,
+ solo_dev->nr_chans, solo_dev->nr_ext);
+
return 0;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
