summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/adv_pci_dio.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2015-11-18 10:07:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-21 15:57:40 -0800
commitd0b5860c273ae04ac1b747572aca04354f6515e1 (patch)
treec0e910baaf6a1d8e0834aab470232662cbcde372 /drivers/staging/comedi/drivers/adv_pci_dio.c
parent6a1c0149a4dd96e2a689f6e279727d04ef2fd81a (diff)
downloadop-kernel-dev-d0b5860c273ae04ac1b747572aca04354f6515e1.zip
op-kernel-dev-d0b5860c273ae04ac1b747572aca04354f6515e1.tar.gz
staging: comedi: adv_pci_dio: cleanup PCI-1762 interrupt registers
For aesthetics, use a common define for the interrupt control and status registers. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/adv_pci_dio.c')
-rw-r--r--drivers/staging/comedi/drivers/adv_pci_dio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 5aba40e..6fafc24 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -70,9 +70,8 @@ enum hw_cards_id {
/* PCI-1752, PCI-1756 special registers */
#define PCI1752_CFC_REG 0x12 /* R/W: channel freeze function */
-/* Advantech PCI-1762 registers */
-#define PCI1762_ICR 6 /* W: Interrupt control register */
-#define PCI1762_ISR 6 /* R: Interrupt status register */
+/* PCI-1762 interrupt control registers */
+#define PCI1762_INT_REG 0x06 /* R/W: status/control */
struct diosubd_data {
int chans; /* num of chans or 8255 devices */
@@ -326,7 +325,7 @@ static int pci_dio_reset(struct comedi_device *dev)
}
break;
case TYPE_PCI1762:
- outw(0x0101, dev->iobase + PCI1762_ICR);
+ outw(0x0101, dev->iobase + PCI1762_INT_REG);
break;
default:
break;
OpenPOWER on IntegriCloud