From c194a87d5daf5de4f8fa59e136abb6f7d65f8f28 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 18 Mar 2013 17:19:02 +0000
Subject: [PATCH] --- yaml --- r: 363687 b: refs/heads/master c:
 add873f29c6ed2c797208b861a99d992172b9495 h: refs/heads/master i:   363685:
 bd45b18e3342c9dcac4ecfa4c3aace9aaf7ca16b   363683:
 f6fbb784a32064f18c822f4350436677f13fbb6c   363679:
 54666737cb735f6d5e92e2f8a1dee0b4bc81aaa2 v: v3

---
 [refs]                                             |  2 +-
 .../drivers/staging/comedi/drivers/amplc_dio200.c  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 736d49e96d40..67951b1e88dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7282f05e1cb39556b5e29d113803e934f3e6d3e
+refs/heads/master: add873f29c6ed2c797208b861a99d992172b9495
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index c004f4ebc563..a741fde84b7c 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -581,13 +581,13 @@ struct dio200_subdev_8255 {
 };
 
 struct dio200_subdev_intr {
-	unsigned int ofs;
 	spinlock_t spinlock;
-	int active;
+	unsigned int ofs;
 	unsigned int valid_isns;
 	unsigned int enabled_isns;
 	unsigned int stopcount;
-	int continuous;
+	bool active:1;
+	bool continuous:1;
 };
 
 static inline const struct dio200_layout *
@@ -723,7 +723,7 @@ static void dio200_stop_intr(struct comedi_device *dev,
 	const struct dio200_layout *layout = dio200_dev_layout(dev);
 	struct dio200_subdev_intr *subpriv = s->private;
 
-	subpriv->active = 0;
+	subpriv->active = false;
 	subpriv->enabled_isns = 0;
 	if (layout->has_int_sce)
 		dio200_write8(dev, subpriv->ofs, 0);
@@ -745,7 +745,7 @@ static int dio200_start_intr(struct comedi_device *dev,
 	if (!subpriv->continuous && subpriv->stopcount == 0) {
 		/* An empty acquisition! */
 		s->async->events |= COMEDI_CB_EOA;
-		subpriv->active = 0;
+		subpriv->active = false;
 		retval = 1;
 	} else {
 		/* Determine interrupt sources to enable. */
@@ -998,12 +998,12 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev,
 	/* Set up end of acquisition. */
 	switch (cmd->stop_src) {
 	case TRIG_COUNT:
-		subpriv->continuous = 0;
+		subpriv->continuous = false;
 		subpriv->stopcount = cmd->stop_arg;
 		break;
 	default:
 		/* TRIG_NONE */
-		subpriv->continuous = 1;
+		subpriv->continuous = true;
 		subpriv->stopcount = 0;
 		break;
 	}