[media] solo6x10: move global fields in solo_dev_fh to solo_dev

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@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Mar 25, 2013 · 6a2e65d · 6a2e65d
1 parent 9416049
commit 6a2e65d
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 137 deletions.
diff --git 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)