OSDN Git Service

staging: comedi: adl_pci9118: rename PCI9118_GAIN define
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 4 Sep 2014 19:14:20 +0000 (12:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:55:54 +0000 (13:55 -0700)
For aesthetics, rename this define used for the analog input chanlist
programming register.

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/adl_pci9118.c

index 5eca67f..19a2353 100644 (file)
 #define PCI9118_AI_CTRL_DMA            (1 << 0)  /* 1=enable DMA */
 #define PCI9118_DIO_REG                        0x1c
 #define PCI9118_SOFTTRG_REG            0x20
+#define PCI9118_AI_CHANLIST_REG                0x24
 
-#define PCI9118_GAIN   0x24    /* W:   A/D gain/channel register */
 #define PCI9118_BURST  0x28    /* W:   A/D burst number register */
 #define PCI9118_SCANMOD        0x2c    /* W:   A/D auto scan mode */
 #define PCI9118_ADFUNC 0x30    /* W:   A/D function register */
@@ -438,7 +438,8 @@ static int setup_channel_list(struct comedi_device *dev,
                        gain = CR_RANGE(chanlist[0]);
                                                /* get gain number */
                        scanquad |= ((gain & 0x03) << 8);
-                       outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
+                       outl(scanquad | ssh,
+                            dev->iobase + PCI9118_AI_CHANLIST_REG);
                        ssh = devpriv->softsshhold;
                }
        }
@@ -450,7 +451,7 @@ static int setup_channel_list(struct comedi_device *dev,
 #endif
                gain = CR_RANGE(chanlist[i]);           /* get gain number */
                scanquad |= ((gain & 0x03) << 8);
-               outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
+               outl(scanquad | ssh, dev->iobase + PCI9118_AI_CHANLIST_REG);
        }
 
        if (backadd) {          /* insert channels for fit onto 32bit DMA */
@@ -459,7 +460,8 @@ static int setup_channel_list(struct comedi_device *dev,
                                                        /* get channel number */
                        gain = CR_RANGE(chanlist[0]);   /* get gain number */
                        scanquad |= ((gain & 0x03) << 8);
-                       outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
+                       outl(scanquad | ssh,
+                            dev->iobase + PCI9118_AI_CHANLIST_REG);
                }
        }
 #ifdef PCI9118_PARANOIDCHECK