[PATCH 016/108] staging: comedi: addi_apci_3120: rename APCI3120_ENABLE_EXT_TRIGGER

[H Hartley Sweeten]

For aesthetics, rename this define.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 7 ++-----
 drivers/staging/comedi/drivers/addi_apci_3120.c           | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 8e474a1..7770468 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -89,9 +89,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 #define APCI3120_RD_STATUS		0x02
 #define APCI3120_RD_FIFO		0x00
 
-/* Enable external trigger bit in nWrAddress */
-#define APCI3120_ENABLE_EXT_TRIGGER	0x8000
-
 /* ANALOG OUTPUT AND INPUT DEFINE */
 #define APCI3120_UNIPOLAR		0x80
 #define APCI3120_BIPOLAR		0x00
@@ -484,7 +481,7 @@ static int apci3120_exttrig_enable(struct comedi_device *dev)
 {
 	struct apci3120_private *devpriv = dev->private;
 
-	devpriv->ctrl |= APCI3120_ENABLE_EXT_TRIGGER;
+	devpriv->ctrl |= APCI3120_CTRL_EXT_TRIG;
 	outw(devpriv->ctrl, dev->iobase + APCI3120_WR_ADDRESS);
 	return 0;
 }
@@ -493,7 +490,7 @@ static int apci3120_exttrig_disable(struct comedi_device *dev)
 {
 	struct apci3120_private *devpriv = dev->private;
 
-	devpriv->ctrl &= ~APCI3120_ENABLE_EXT_TRIGGER;
+	devpriv->ctrl &= ~APCI3120_CTRL_EXT_TRIG;
 	outw(devpriv->ctrl, dev->iobase + APCI3120_WR_ADDRESS);
 	return 0;
 }
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 58db0ab..087ff1a 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -15,6 +15,7 @@
 /*
  * PCI BAR 1 register map (dev->iobase)
  */
+#define APCI3120_CTRL_EXT_TRIG			(1 << 15)
 #define APCI3120_CTRL_GATE(x)			(1 << (12 + (x)))
 #define APCI3120_CTRL_PR(x)			(((x) & 0xf) << 8)
 #define APCI3120_CTRL_PA(x)			(((x) & 0xf) << 0)
-- 
2.0.3