From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:54:00 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: rename APCI3120_ENABLE_EXT_TRIGGER X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6d210c8d96b7ae073ed43c46de21329115e9090a;p=deliverable%2Flinux.git staging: comedi: addi_apci_3120: rename APCI3120_ENABLE_EXT_TRIGGER For aesthetics, rename this define. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 8e474a14a670..77704685e108 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 58db0aba088b..087ff1acf088 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)