staging: comedi: adv_pci_dio: cleanup PCI-1762 interrupt registers
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 18 Nov 2015 17:07:28 +0000 (10:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Dec 2015 23:57:40 +0000 (15:57 -0800)
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>
drivers/staging/comedi/drivers/adv_pci_dio.c

index 5aba40e9b3502d94ed189d814408cfab2774cd3c..6fafc2402d427b6ab0009fa97283bb6ae80e78a9 100644 (file)
@@ -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;