Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / drivers / dt2811.c

diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index 99cd98067ca499b00a1c22e8807aa7e9d8d3de98..165ea6f22ba480b09a7e8cd28c130c768855e33c 100644 (file)
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -51,42 +51,42 @@ Configuration options:
 
 static const char *driver_name = "dt2811";
 
-static const comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 4, {
                        RANGE(0, 5),
                        RANGE(0, 2.5),
                        RANGE(0, 1.25),
                        RANGE(0, 0.625)
        }
 };
-static const comedi_lrange range_dt2811_pgh_ai_2_5_bipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgh_ai_2_5_bipolar = { 4, {
                        RANGE(-2.5, 2.5),
                        RANGE(-1.25, 1.25),
                        RANGE(-0.625, 0.625),
                        RANGE(-0.3125, 0.3125)
        }
 };
-static const comedi_lrange range_dt2811_pgh_ai_5_bipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgh_ai_5_bipolar = { 4, {
                        RANGE(-5, 5),
                        RANGE(-2.5, 2.5),
                        RANGE(-1.25, 1.25),
                        RANGE(-0.625, 0.625)
        }
 };
-static const comedi_lrange range_dt2811_pgl_ai_5_unipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgl_ai_5_unipolar = { 4, {
                        RANGE(0, 5),
                        RANGE(0, 0.5),
                        RANGE(0, 0.05),
                        RANGE(0, 0.01)
        }
 };
-static const comedi_lrange range_dt2811_pgl_ai_2_5_bipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgl_ai_2_5_bipolar = { 4, {
                        RANGE(-2.5, 2.5),
                        RANGE(-0.25, 0.25),
                        RANGE(-0.025, 0.025),
                        RANGE(-0.005, 0.005)
        }
 };
-static const comedi_lrange range_dt2811_pgl_ai_5_bipolar = { 4, {
+static const struct comedi_lrange range_dt2811_pgl_ai_5_bipolar = { 4, {
                        RANGE(-5, 5),
                        RANGE(-0.5, 0.5),
                        RANGE(-0.05, 0.05),
@@ -193,9 +193,9 @@ static const comedi_lrange range_dt2811_pgl_ai_5_bipolar = { 4, {
 
 typedef struct {
        const char *name;
-       const comedi_lrange *bip_5;
-       const comedi_lrange *bip_2_5;
-       const comedi_lrange *unip_5;
+       const struct comedi_lrange *bip_5;
+       const struct comedi_lrange *bip_2_5;
+       const struct comedi_lrange *unip_5;
 } boardtype;
 static const boardtype boardtypes[] = {
        {"dt2811-pgh",
@@ -212,9 +212,9 @@ static const boardtype boardtypes[] = {
 
 #define this_board ((const boardtype *)dev->board_ptr)
 
-static int dt2811_attach(comedi_device * dev, comedi_devconfig * it);
-static int dt2811_detach(comedi_device * dev);
-static comedi_driver driver_dt2811 = {
+static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int dt2811_detach(struct comedi_device * dev);
+static struct comedi_driver driver_dt2811 = {
       driver_name:"dt2811",
       module:THIS_MODULE,
       attach:dt2811_attach,
@@ -226,16 +226,16 @@ static comedi_driver driver_dt2811 = {
 
 COMEDI_INITCLEANUP(driver_dt2811);
 
-static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
-static int dt2811_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data);
+static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
 
 enum { card_2811_pgh, card_2811_pgl };
 typedef struct {
@@ -247,13 +247,13 @@ typedef struct {
        enum {
                dac_bipolar_5, dac_bipolar_2_5, dac_unipolar_5
        } dac_range[2];
-       const comedi_lrange *range_type_list[2];
-       lsampl_t ao_readback[2];
+       const struct comedi_lrange *range_type_list[2];
+       unsigned int ao_readback[2];
 } dt2811_private;
 
 #define devpriv ((dt2811_private *)dev->private)
 
-static const comedi_lrange *dac_range_types[] = {
+static const struct comedi_lrange *dac_range_types[] = {
        &range_bipolar5,
        &range_bipolar2_5,
        &range_unipolar5
@@ -266,7 +266,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
 {
        int lo, hi;
        int data;
-       comedi_device *dev = d;
+       struct comedi_device *dev = d;
 
        if (!dev->attached) {
                comedi_error(dev, "spurious interrupt");
@@ -308,13 +308,13 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
                  2 == unipolar 5V  (0V -- +5V)
 */
 
-static int dt2811_attach(comedi_device * dev, comedi_devconfig * it)
+static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
        //int i, irq;
        //unsigned long irqs;
        //long flags;
        int ret;
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        unsigned long iobase;
 
        iobase = it->options[0];
@@ -476,7 +476,7 @@ static int dt2811_attach(comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int dt2811_detach(comedi_device * dev)
+static int dt2811_detach(struct comedi_device * dev)
 {
        printk("comedi%d: dt2811: remove\n", dev->minor);
 
@@ -490,8 +490,8 @@ static int dt2811_detach(comedi_device * dev)
        return 0;
 }
 
-static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec);
        int timeout = DT2811_TIMEOUT;
@@ -519,7 +519,7 @@ static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s,
  * replaced, so I'll let it stay. */
 int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig)
 {
-       comedi_device *dev = comedi_devices + minor;
+       struct comedi_device *dev = comedi_devices + minor;
 
        if (adtrig->n < 1)
                return 0;
@@ -541,8 +541,8 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig)
 }
 #endif
 
-static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan;
@@ -559,8 +559,8 @@ static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan;
@@ -574,8 +574,8 @@ static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -585,8 +585,8 @@ static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int dt2811_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;