staging: comedi: me4000: remove ao context

The ao context is a struct containing all the register addresses
used with the ao subdevice. These can easily be calculated when
needed. Remove the me4000_ao_context struct, its initialization
function, and it's variable in the private data.

The last value written to the ao channels still needs to be saved
in the private data for readback.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 9cd24d2..418a679 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -217,7 +217,6 @@ static const struct me4000_board me4000_boards[] = {
   ---------------------------------------------------------------------------*/
 static int init_board_info(struct comedi_device *dev,
                           struct pci_dev *pci_dev_p);
-static int init_ao_context(struct comedi_device *dev);
 static int xilinx_download(struct comedi_device *dev);
 static int reset_board(struct comedi_device *dev);
 
@@ -315,10 +314,6 @@ found:
        if (result)
                return result;
 
-       result = init_ao_context(dev);
-       if (result)
-               return result;
-
        result = xilinx_download(dev);
        if (result)
                return result;
@@ -342,88 +337,6 @@ static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
        return 0;
 }
 
-static int init_ao_context(struct comedi_device *dev)
-{
-       const struct me4000_board *thisboard = comedi_board(dev);
-       int i;
-
-       for (i = 0; i < thisboard->ao_nchan; i++) {
-               /* spin_lock_init(&info->ao_context[i].use_lock); */
-               info->ao_context[i].irq = info->irq;
-
-               switch (i) {
-               case 0:
-                       info->ao_context[i].ctrl_reg =
-                           dev->iobase + ME4000_AO_00_CTRL_REG;
-                       info->ao_context[i].status_reg =
-                           dev->iobase + ME4000_AO_00_STATUS_REG;
-                       info->ao_context[i].fifo_reg =
-                           dev->iobase + ME4000_AO_00_FIFO_REG;
-                       info->ao_context[i].single_reg =
-                           dev->iobase + ME4000_AO_00_SINGLE_REG;
-                       info->ao_context[i].timer_reg =
-                           dev->iobase + ME4000_AO_00_TIMER_REG;
-                       info->ao_context[i].irq_status_reg =
-                           dev->iobase + ME4000_IRQ_STATUS_REG;
-                       info->ao_context[i].preload_reg =
-                           dev->iobase + ME4000_AO_LOADSETREG_XX;
-                       break;
-               case 1:
-                       info->ao_context[i].ctrl_reg =
-                           dev->iobase + ME4000_AO_01_CTRL_REG;
-                       info->ao_context[i].status_reg =
-                           dev->iobase + ME4000_AO_01_STATUS_REG;
-                       info->ao_context[i].fifo_reg =
-                           dev->iobase + ME4000_AO_01_FIFO_REG;
-                       info->ao_context[i].single_reg =
-                           dev->iobase + ME4000_AO_01_SINGLE_REG;
-                       info->ao_context[i].timer_reg =
-                           dev->iobase + ME4000_AO_01_TIMER_REG;
-                       info->ao_context[i].irq_status_reg =
-                           dev->iobase + ME4000_IRQ_STATUS_REG;
-                       info->ao_context[i].preload_reg =
-                           dev->iobase + ME4000_AO_LOADSETREG_XX;
-                       break;
-               case 2:
-                       info->ao_context[i].ctrl_reg =
-                           dev->iobase + ME4000_AO_02_CTRL_REG;
-                       info->ao_context[i].status_reg =
-                           dev->iobase + ME4000_AO_02_STATUS_REG;
-                       info->ao_context[i].fifo_reg =
-                           dev->iobase + ME4000_AO_02_FIFO_REG;
-                       info->ao_context[i].single_reg =
-                           dev->iobase + ME4000_AO_02_SINGLE_REG;
-                       info->ao_context[i].timer_reg =
-                           dev->iobase + ME4000_AO_02_TIMER_REG;
-                       info->ao_context[i].irq_status_reg =
-                           dev->iobase + ME4000_IRQ_STATUS_REG;
-                       info->ao_context[i].preload_reg =
-                           dev->iobase + ME4000_AO_LOADSETREG_XX;
-                       break;
-               case 3:
-                       info->ao_context[i].ctrl_reg =
-                           dev->iobase + ME4000_AO_03_CTRL_REG;
-                       info->ao_context[i].status_reg =
-                           dev->iobase + ME4000_AO_03_STATUS_REG;
-                       info->ao_context[i].fifo_reg =
-                           dev->iobase + ME4000_AO_03_FIFO_REG;
-                       info->ao_context[i].single_reg =
-                           dev->iobase + ME4000_AO_03_SINGLE_REG;
-                       info->ao_context[i].timer_reg =
-                           dev->iobase + ME4000_AO_03_TIMER_REG;
-                       info->ao_context[i].irq_status_reg =
-                           dev->iobase + ME4000_IRQ_STATUS_REG;
-                       info->ao_context[i].preload_reg =
-                           dev->iobase + ME4000_AO_LOADSETREG_XX;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       return 0;
-}
-
 #define FIRMWARE_NOT_AVAILABLE 1
 #if FIRMWARE_NOT_AVAILABLE
 extern unsigned char *xilinx_firm;
@@ -512,34 +425,28 @@ static int xilinx_download(struct comedi_device *dev)
 
 static int reset_board(struct comedi_device *dev)
 {
-       unsigned long icr;
+       unsigned long val;
+       int chan;
 
        /* Make a hardware reset */
-       icr = inl(info->plx_regbase + PLX_ICR);
-       icr |= 0x40000000;
-       outl(icr, info->plx_regbase + PLX_ICR);
-       icr &= ~0x40000000;
-       outl(icr, info->plx_regbase + PLX_ICR);
+       val = inl(info->plx_regbase + PLX_ICR);
+       val |= 0x40000000;
+       outl(val, info->plx_regbase + PLX_ICR);
+       val &= ~0x40000000;
+       outl(val , info->plx_regbase + PLX_ICR);
 
        /* 0x8000 to the DACs means an output voltage of 0V */
-       outl(0x8000, dev->iobase + ME4000_AO_00_SINGLE_REG);
-       outl(0x8000, dev->iobase + ME4000_AO_01_SINGLE_REG);
-       outl(0x8000, dev->iobase + ME4000_AO_02_SINGLE_REG);
-       outl(0x8000, dev->iobase + ME4000_AO_03_SINGLE_REG);
+       for (chan = 0; chan < 4; chan++)
+               outl(0x8000, dev->iobase + ME4000_AO_SINGLE_REG(chan));
 
        /* Set both stop bits in the analog input control register */
        outl(ME4000_AI_CTRL_BIT_IMMEDIATE_STOP | ME4000_AI_CTRL_BIT_STOP,
                dev->iobase + ME4000_AI_CTRL_REG);
 
        /* Set both stop bits in the analog output control register */
-       outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,
-               dev->iobase + ME4000_AO_00_CTRL_REG);
-       outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,
-               dev->iobase + ME4000_AO_01_CTRL_REG);
-       outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,
-               dev->iobase + ME4000_AO_02_CTRL_REG);
-       outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,
-               dev->iobase + ME4000_AO_03_CTRL_REG);
+       val = ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP;
+       for (chan = 0; chan < 4; chan++)
+               outl(val, dev->iobase + ME4000_AO_CTRL_REG(chan));
 
        /* Enable interrupts on the PLX */
        outl(0x43, info->plx_regbase + PLX_INTCSR);
@@ -1537,18 +1444,18 @@ static int me4000_ao_insn_write(struct comedi_device *dev,
        }
 
        /* Stop any running conversion */
-       tmp = inl(info->ao_context[chan].ctrl_reg);
+       tmp = inl(dev->iobase + ME4000_AO_CTRL_REG(chan));
        tmp |= ME4000_AO_CTRL_BIT_IMMEDIATE_STOP;
-       outl(tmp, info->ao_context[chan].ctrl_reg);
+       outl(tmp, dev->iobase + ME4000_AO_CTRL_REG(chan));
 
        /* Clear control register and set to single mode */
-       outl(0x0, info->ao_context[chan].ctrl_reg);
+       outl(0x0, dev->iobase + ME4000_AO_CTRL_REG(chan));
 
        /* Write data value */
-       outl(data[0], info->ao_context[chan].single_reg);
+       outl(data[0], dev->iobase + ME4000_AO_SINGLE_REG(chan));
 
        /* Store in the mirror */
-       info->ao_context[chan].mirror = data[0];
+       info->ao_readback[chan] = data[0];
 
        return 1;
 }
@@ -1568,7 +1475,7 @@ static int me4000_ao_insn_read(struct comedi_device *dev,
                return -EINVAL;
        }
 
-       data[0] = info->ao_context[chan].mirror;
+       data[0] = info->ao_readback[chan];
 
        return 1;
 }

diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 80bc51e..042ec4c 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -28,29 +28,13 @@
   ME-4000 base register offsets
   ===========================================================================*/
 
-#define ME4000_AO_00_CTRL_REG                  0x00    /*  R/W */
-#define ME4000_AO_00_STATUS_REG                        0x04    /*  R/_ */
-#define ME4000_AO_00_FIFO_REG                  0x08    /*  _/W */
-#define ME4000_AO_00_SINGLE_REG                        0x0C    /*  R/W */
-#define ME4000_AO_00_TIMER_REG                 0x10    /*  _/W */
-
-#define ME4000_AO_01_CTRL_REG                  0x18    /*  R/W */
-#define ME4000_AO_01_STATUS_REG                        0x1C    /*  R/_ */
-#define ME4000_AO_01_FIFO_REG                  0x20    /*  _/W */
-#define ME4000_AO_01_SINGLE_REG                        0x24    /*  R/W */
-#define ME4000_AO_01_TIMER_REG                 0x28    /*  _/W */
-
-#define ME4000_AO_02_CTRL_REG                  0x30    /*  R/W */
-#define ME4000_AO_02_STATUS_REG                        0x34    /*  R/_ */
-#define ME4000_AO_02_FIFO_REG                  0x38    /*  _/W */
-#define ME4000_AO_02_SINGLE_REG                        0x3C    /*  R/W */
-#define ME4000_AO_02_TIMER_REG                 0x40    /*  _/W */
-
-#define ME4000_AO_03_CTRL_REG                  0x48    /*  R/W */
-#define ME4000_AO_03_STATUS_REG                        0x4C    /*  R/_ */
-#define ME4000_AO_03_FIFO_REG                  0x50    /*  _/W */
-#define ME4000_AO_03_SINGLE_REG                        0x54    /*  R/W */
-#define ME4000_AO_03_TIMER_REG                 0x58    /*  _/W */
+#define ME4000_AO_CHAN(x)                      ((x) * 0x18)
+
+#define ME4000_AO_CTRL_REG(x)                  (0x00 + ME4000_AO_CHAN(x))
+#define ME4000_AO_STATUS_REG(x)                        (0x04 + ME4000_AO_CHAN(x))
+#define ME4000_AO_FIFO_REG(x)                  (0x08 + ME4000_AO_CHAN(x))
+#define ME4000_AO_SINGLE_REG(x)                        (0x0c + ME4000_AO_CHAN(x))
+#define ME4000_AO_TIMER_REG(x)                 (0x10 + ME4000_AO_CHAN(x))
 
 #define ME4000_AI_CTRL_REG                     0x74    /*  _/W */
 #define ME4000_AI_STATUS_REG                   0x74    /*  R/_ */
@@ -233,20 +217,6 @@
   Global board and subdevice information structures
   ===========================================================================*/
 
-struct me4000_ao_context {
-       int irq;
-
-       unsigned long mirror;   /*  Store the last written value */
-
-       unsigned long ctrl_reg;
-       unsigned long status_reg;
-       unsigned long fifo_reg;
-       unsigned long single_reg;
-       unsigned long timer_reg;
-       unsigned long irq_status_reg;
-       unsigned long preload_reg;
-};
-
 struct me4000_info {
        unsigned long plx_regbase;      /*  PLX configuration space base address */
        unsigned long timer_regbase;    /*  Base address of the timer circuit */
@@ -256,7 +226,7 @@ struct me4000_info {
 
        unsigned int irq;       /*  IRQ assigned from the PCI BIOS */
 
-       struct me4000_ao_context ao_context[4]; /*  Vector with analog output specific context */
+       unsigned int ao_readback[4];
 };
 
 #define info   ((struct me4000_info *)dev->private)