V4L/DVB (13428): cx18: Rename mdl_offset to mdl_base_idx or free_mdl_idx as appropriate

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 0b182fa2ad0..1a899e0773d 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -337,7 +337,7 @@ struct cx18_stream {
         const char *name;               /* name of the stream */
         int type;                       /* stream type */
         u32 handle;                     /* task handle */
-        unsigned mdl_offset;
+        unsigned int mdl_base_idx;
 
         u32 id;
         unsigned long s_flags;  /* status flags, see above */
@@ -514,7 +514,7 @@ struct cx18 {
         u16 buffer_id;          /* buffer ID counter */
         u32 v4l2_cap;           /* V4L2 capabilities of card */
         u32 hw_flags;           /* Hardware description of the board */
-        unsigned mdl_offset;
+        unsigned int free_mdl_idx;
         struct cx18_scb __iomem *scb; /* pointer to SCB */
         struct mutex epu2apu_mb_lock; /* protect driver to chip mailbox in SCB*/
         struct mutex epu2cpu_mb_lock; /* protect driver to chip mailbox in SCB*/
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index afe46c3d405..4a1249a7d46 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -178,8 +178,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_in_work_order *order)
                  * and send them back to q_free for fw rotation eventually.
                  */
                 if ((order->flags & CX18_F_EWO_MB_STALE_UPON_RECEIPT) &&
-                    !(id >= s->mdl_offset &&
-                      id < (s->mdl_offset + s->buffers))) {
+                    !(id >= s->mdl_base_idx &&
+                      id < (s->mdl_base_idx + s->buffers))) {
                         CX18_WARN("Fell behind! Ignoring stale mailbox with "
                                   " inconsistent data. Lost buffer for mailbox "
                                   "seq no %d\n", mb->request);
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index bc4c5e4a6c0..b9bd4ff5535 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -194,7 +194,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
                 s->name, s->buffers, s->buf_size,
                 s->buffers * s->buf_size / 1024);
 
-        if (((char __iomem *)&cx->scb->cpu_mdl[cx->mdl_offset + s->buffers] -
+        if (((char __iomem *)&cx->scb->cpu_mdl[cx->free_mdl_idx + s->buffers] -
                                 (char __iomem *)cx->scb) > SCB_RESERVED_SIZE) {
                 unsigned bufsz = (((char __iomem *)cx->scb) + SCB_RESERVED_SIZE -
                                         ((char __iomem *)cx->scb->cpu_mdl));
@@ -205,7 +205,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
                 return -ENOMEM;
         }
 
-        s->mdl_offset = cx->mdl_offset;
+        s->mdl_base_idx = cx->free_mdl_idx;
 
         /* allocate stream buffers. Initially all buffers are in q_free. */
         for (i = 0; i < s->buffers; i++) {
@@ -227,7 +227,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
                 cx18_enqueue(s, buf, &s->q_free);
         }
         if (i == s->buffers) {
-                cx->mdl_offset += s->buffers;
+                cx->free_mdl_idx += s->buffers;
                 return 0;
         }
         CX18_ERR("Couldn't allocate buffers for %s stream\n", s->name);