From 782364ff9670f1b666eaa8056b59dde576eb6e4a Mon Sep 17 00:00:00 2001
From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Date: Sun, 1 May 2016 18:17:28 +0200
Subject: [PATCH] fthd: Rename FTHD_BUFFERS to FTHD_NUM_BUFS

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
---
 fthd_drv.h  |  4 ++--
 fthd_v4l2.c | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fthd_drv.h b/fthd_drv.h
index 06b9ef9..3db1bcf 100644
--- a/fthd_drv.h
+++ b/fthd_drv.h
@@ -36,7 +36,7 @@
 #define FTHD_PCI_S2_MEM 2
 #define FTHD_PCI_ISP_IO 4
 
-#define FTHD_BUFFERS 4
+#define FTHD_NUM_BUFS 4
 
 enum FW_CHAN_TYPE {
 	FW_CHAN_TYPE_OUT=0,
@@ -119,7 +119,7 @@ struct fthd_private {
 	struct mutex vb2_queue_lock;
 	struct list_head buffer_queue;
 	struct vb2_alloc_ctx *alloc_ctx;
-	struct h2t_buf_ctx h2t_bufs[FTHD_BUFFERS];
+	struct h2t_buf_ctx h2t_bufs[FTHD_NUM_BUFS];
 
 	struct v4l2_ctrl_handler v4l2_ctrl_handler;
 	int frametime;
diff --git a/fthd_v4l2.c b/fthd_v4l2.c
index b9eb685..ca8a759 100644
--- a/fthd_v4l2.c
+++ b/fthd_v4l2.c
@@ -73,12 +73,13 @@ static void fthd_buffer_cleanup(struct vb2_buffer *vb)
 	int i;
 
 	pr_debug("%p\n", vb);
-	for (i = 0; i < FTHD_BUFFERS; i++) {
+	for (i = 0; i < FTHD_NUM_BUFS; i++) {
 		if (dev_priv->h2t_bufs[i].vb == vb) {
 			ctx = dev_priv->h2t_bufs + i;
 			break;
-		};
+		}
 	}
+
 	if (!ctx || ctx->state == BUF_FREE)
 		return;
 
@@ -120,7 +121,7 @@ static void fthd_buffer_queue(struct vb2_buffer *vb)
 
 	int i;
 	pr_debug("vb = %p\n", vb);
-	for (i = 0; i < FTHD_BUFFERS; i++) {
+	for (i = 0; i < FTHD_NUM_BUFS; i++) {
 		if (dev_priv->h2t_bufs[i].vb == vb) {
 			ctx = dev_priv->h2t_bufs + i;
 			break;
@@ -163,7 +164,7 @@ static int fthd_buffer_prepare(struct vb2_buffer *vb)
 	int i;
 
 	pr_debug("%p\n", vb);
-	for (i = 0; i < FTHD_BUFFERS; i++) {
+	for (i = 0; i < FTHD_NUM_BUFS; i++) {
 		if (dev_priv->h2t_bufs[i].state == BUF_FREE ||
 		    (dev_priv->h2t_bufs[i].state == BUF_ALLOC &&
 		     dev_priv->h2t_bufs[i].vb == vb)) {
@@ -251,7 +252,7 @@ static int fthd_start_streaming(struct vb2_queue *vq, unsigned int count)
 	if (ret)
 		return ret;
 
-	for (i = 0; i < FTHD_BUFFERS && count; i++, count--) {
+	for (i = 0; i < FTHD_NUM_BUFS && count; i++, count--) {
 		ctx = dev_priv->h2t_bufs + i;
 		if (ctx->state != BUF_DRV_QUEUED)
 			continue;
@@ -279,7 +280,7 @@ static void fthd_stop_streaming(struct vb2_queue *vq)
 		pr_debug("done\n");
 	} else {
 		/* Firmware doesn't respond. */
-		for (i = 0; i < FTHD_BUFFERS;i++) {
+		for (i = 0; i < FTHD_NUM_BUFS;i++) {
 			ctx = dev_priv->h2t_bufs + i;
 			if (ctx->state == BUF_DRV_QUEUED ||
 			    ctx->state == BUF_HW_QUEUED) {
@@ -500,7 +501,7 @@ static int fthd_v4l2_ioctl_g_parm(struct file *filp, void *priv,
 	if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 		return -EINVAL;
 
-	parm->parm.capture.readbuffers = FTHD_BUFFERS;
+	parm->parm.capture.readbuffers = FTHD_NUM_BUFS;
 	parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
 	parm->parm.capture.timeperframe = timeperframe;