From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 4 Jan 2017 10:55:36 +0000 (+0000)
Subject: staging: comedi: daqboard2000: use type 'u16' for CPLD data and status
X-Git-Tag: v4.14-rc1~1455^2~408
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc3a8239009d6eac56e5076ea5e3eef2b61cd9b;p=platform%2Fkernel%2Flinux-rpi.git

staging: comedi: daqboard2000: use type 'u16' for CPLD data and status

The CPLD status and data registers used to load firmware are 16 bits
wide.  Use the type `u16` to represent data and status values instead of
`int`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 954a1a5..e73baba7 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -470,11 +470,11 @@ static void daqboard2000_pulse_prog_pin(struct comedi_device *dev)
 	mdelay(10);	/* Not in the original code, but I like symmetry... */
 }
 
-static int daqboard2000_poll_cpld(struct comedi_device *dev, int mask)
+static int daqboard2000_poll_cpld(struct comedi_device *dev, u16 mask)
 {
 	int result = 0;
 	int i;
-	int cpld;
+	u16 cpld;
 
 	/* timeout after 50 tries -> 5ms */
 	for (i = 0; i < 50; i++) {
@@ -489,7 +489,7 @@ static int daqboard2000_poll_cpld(struct comedi_device *dev, int mask)
 	return result;
 }
 
-static int daqboard2000_write_cpld(struct comedi_device *dev, int data)
+static int daqboard2000_write_cpld(struct comedi_device *dev, u16 data)
 {
 	int result = 0;
 
@@ -527,7 +527,7 @@ static int daqboard2000_load_firmware(struct comedi_device *dev,
 					break;
 			}
 			for (; i < len; i += 2) {
-				int data =
+				u16 data =
 				    (cpld_array[i] << 8) + cpld_array[i + 1];
 				if (!daqboard2000_write_cpld(dev, data))
 					break;