[media] marvell-ccic: use vb2 helpers and core locking

[deliverable/linux.git] / drivers / media / platform / marvell-ccic / mcam-core.h

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index aa0c6eac254a4cd5813dd660d279334202e9e747..2847e06c5fc88ccc4c1ebd2d14ac6b2d0dd5e44a 100644 (file)
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -146,7 +146,6 @@ struct mcam_camera {
        struct v4l2_ctrl_handler ctrl_handler;
        enum mcam_state state;
        unsigned long flags;            /* Buffer status, mainly (dev_lock) */
-       int users;                      /* How many open FDs */
 
        struct mcam_frame_state frame_state;    /* Frame state counter */
        /*
@@ -163,6 +162,8 @@ struct mcam_camera {
        unsigned int nbufs;             /* How many are alloc'd */
        int next_buf;                   /* Next to consume (dev_lock) */
 
+       char bus_info[32];              /* querycap bus_info */
+
        /* DMA buffers - vmalloc mode */
 #ifdef MCAM_MODE_VMALLOC
        unsigned int dma_buf_size;      /* allocated size */