Staging: comedi: Finish removing ni_private typedef

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / poc.c

diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index 19b143f..ca439ba 100644 (file)
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -41,38 +41,38 @@ Configuration options:
 
 #include <linux/ioport.h>
 
-static int poc_attach(comedi_device * dev, comedi_devconfig * it);
-static int poc_detach(comedi_device * dev);
-static int readback_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-
-static int dac02_ao_winsn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int pcl733_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int pcl734_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
+static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it);
+static int poc_detach(struct comedi_device * dev);
+static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+
+static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
 
 struct boarddef_struct {
        const char *name;
        unsigned int iosize;
-       int (*setup) (comedi_device *);
+       int (*setup) (struct comedi_device *);
        int type;
        int n_chan;
        int n_bits;
-       int (*winsn) (comedi_device *, comedi_subdevice *, comedi_insn *,
-               lsampl_t *);
-       int (*rinsn) (comedi_device *, comedi_subdevice *, comedi_insn *,
-               lsampl_t *);
-       int (*insnbits) (comedi_device *, comedi_subdevice *, comedi_insn *,
-               lsampl_t *);
-       const comedi_lrange *range;
+       int (*winsn) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
+               unsigned int *);
+       int (*rinsn) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
+               unsigned int *);
+       int (*insnbits) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
+               unsigned int *);
+       const struct comedi_lrange *range;
 };
 static const struct boarddef_struct boards[] = {
        {
              name:     "dac02",
              iosize:   8,
-                       //setup:                dac02_setup,
+                       /* setup:                dac02_setup, */
              type:     COMEDI_SUBD_AO,
              n_chan:   2,
              n_bits:   12,
@@ -103,7 +103,7 @@ static const struct boarddef_struct boards[] = {
 #define n_boards (sizeof(boards)/sizeof(boards[0]))
 #define this_board ((const struct boarddef_struct *)dev->board_ptr)
 
-static comedi_driver driver_poc = {
+static struct comedi_driver driver_poc = {
       driver_name:"poc",
       module:THIS_MODULE,
       attach:poc_attach,
@@ -113,9 +113,9 @@ static comedi_driver driver_poc = {
       offset:sizeof(boards[0]),
 };
 
-static int poc_attach(comedi_device * dev, comedi_devconfig * it)
+static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        unsigned long iobase;
        unsigned int iosize;
 
@@ -140,7 +140,7 @@ static int poc_attach(comedi_device * dev, comedi_devconfig * it)
 
        if (alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
-       if (alloc_private(dev, sizeof(lsampl_t) * this_board->n_chan) < 0)
+       if (alloc_private(dev, sizeof(unsigned int) * this_board->n_chan) < 0)
                return -ENOMEM;
 
        /* analog output subdevice */
@@ -159,7 +159,7 @@ static int poc_attach(comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int poc_detach(comedi_device * dev)
+static int poc_detach(struct comedi_device * dev)
 {
        /* only free stuff if it has been allocated by _attach */
        if (dev->iobase)
@@ -170,13 +170,13 @@ static int poc_detach(comedi_device * dev)
        return 0;
 }
 
-static int readback_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan;
 
        chan = CR_CHAN(insn->chanspec);
-       data[0] = ((lsampl_t *) dev->private)[chan];
+       data[0] = ((unsigned int *) dev->private)[chan];
 
        return 1;
 }
@@ -185,18 +185,18 @@ static int readback_insn(comedi_device * dev, comedi_subdevice * s,
 #define DAC02_LSB(a)   (2 * a)
 #define DAC02_MSB(a)   (2 * a + 1)
 
-static int dac02_ao_winsn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int temp;
        int chan;
        int output;
 
        chan = CR_CHAN(insn->chanspec);
-       ((lsampl_t *) dev->private)[chan] = data[0];
+       ((unsigned int *) dev->private)[chan] = data[0];
        output = data[0];
 #ifdef wrong
-       // convert to complementary binary if range is bipolar
+       /*  convert to complementary binary if range is bipolar */
        if ((CR_RANGE(insn->chanspec) & 0x2) == 0)
                output = ~output;
 #endif
@@ -208,8 +208,8 @@ static int dac02_ao_winsn(comedi_device * dev, comedi_subdevice * s,
        return 1;
 }
 
-static int pcl733_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -222,8 +222,8 @@ static int pcl733_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int pcl734_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;