From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 7 Oct 2015 21:52:35 +0000 (-0700)
Subject: staging: comedi: icp_multi: tidy up the DAC command/status register bits
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=01544d6e0ebd4a2f756a69263240c87c8610764e;p=deliverable%2Flinux.git

staging: comedi: icp_multi: tidy up the DAC command/status register bits

For aesthetics, rename these bit defines so they are associated with
the register and use the BIT macro to define them.

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

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 2ee8bf53a9b9..57eded18b99e 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -56,7 +56,11 @@
 #define ICP_MULTI_ADC_CSR_RA	BIT(5)	/* Input range 0 = 5V, 1 = 10V */
 #define ICP_MULTI_ADC_CSR_DI	BIT(6)	/* Input mode 1 = differential */
 #define ICP_MULTI_AI		2	/* R:   Analogue input data */
-#define ICP_MULTI_DAC_CSR	4	/* R/W: DAC command/status register */
+#define ICP_MULTI_DAC_CSR	0x04	/* R/W: DAC command/status register */
+#define ICP_MULTI_DAC_CSR_ST	BIT(0)	/* Start DAC */
+#define ICP_MULTI_DAC_CSR_BSY	BIT(0)	/* DAC busy */
+#define ICP_MULTI_DAC_CSR_BI	BIT(4)	/* Bipolar output range */
+#define ICP_MULTI_DAC_CSR_RA	BIT(5)	/* Output range 0 = 5V, 1 = 10V */
 #define ICP_MULTI_AO		6	/* R/W: Analogue output data */
 #define ICP_MULTI_DI		8	/* R/W: Digital inputs */
 #define ICP_MULTI_DO		0x0A	/* R/W: Digital outputs */
@@ -67,12 +71,6 @@
 #define ICP_MULTI_CNTR2		0x14	/* R/W: Counter 2 */
 #define ICP_MULTI_CNTR3		0x16	/* R/W: Counter 3 */
 
-/*  Define bits from DAC command/status register */
-#define	DAC_ST		0x0001	/* Start DAC */
-#define DAC_BSY		0x0001	/* DAC busy */
-#define	DAC_BI		0x0010	/* Bipolar input range 1 = bipolar */
-#define	DAC_RA		0x0020	/* Input range 0 = 5V, 1 = 10V */
-
 /*  Define bits from interrupt enable/status registers */
 #define	ADC_READY	0x0001	/* A/d conversion ready interrupt */
 #define	DAC_READY	0x0002	/* D/a conversion ready interrupt */
@@ -231,7 +229,7 @@ static int icp_multi_ao_eoc(struct comedi_device *dev,
 	unsigned int status;
 
 	status = readw(dev->mmio + ICP_MULTI_DAC_CSR);
-	if ((status & DAC_BSY) == 0)
+	if ((status & ICP_MULTI_DAC_CSR_BSY) == 0)
 		return 0;
 	return -EBUSY;
 }
@@ -288,10 +286,10 @@ static int icp_multi_ao_insn_write(struct comedi_device *dev,
 
 		writew(val, dev->mmio + ICP_MULTI_AO);
 
-		/*  Set DAC_ST bit to write the data to selected channel */
-		devpriv->DacCmdStatus |= DAC_ST;
+		/* Set start conversion bit to write data to channel */
+		devpriv->DacCmdStatus |= ICP_MULTI_DAC_CSR_ST;
 		writew(devpriv->DacCmdStatus, dev->mmio + ICP_MULTI_DAC_CSR);
-		devpriv->DacCmdStatus &= ~DAC_ST;
+		devpriv->DacCmdStatus &= ~ICP_MULTI_DAC_CSR_ST;
 
 		s->readback[chan] = val;
 	}
@@ -426,7 +424,7 @@ static int icp_multi_reset(struct comedi_device *dev)
 		writew(0, dev->mmio + ICP_MULTI_AO);
 
 		/*  Set start conversion bit */
-		devpriv->DacCmdStatus |= DAC_ST;
+		devpriv->DacCmdStatus |= ICP_MULTI_DAC_CSR_ST;
 
 		/*  Output to command / status register */
 		writew(devpriv->DacCmdStatus, dev->mmio + ICP_MULTI_DAC_CSR);