Staging: comedi: Remove comedi_insn typedef

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

diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 6a8d9a5b7bf7b3bd4770b91778a56bece824c331..c42d89d41e7a8a6875090b6032921900db832c6f 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -180,7 +180,7 @@ typedef struct {
 
 static int atao_attach(struct comedi_device * dev, comedi_devconfig * it);
 static int atao_detach(struct comedi_device * dev);
-static comedi_driver driver_atao = {
+static struct comedi_driver driver_atao = {
       driver_name:"ni_at_ao",
       module:THIS_MODULE,
       attach:atao_attach,
@@ -194,22 +194,22 @@ COMEDI_INITCLEANUP(driver_atao);
 
 static void atao_reset(struct comedi_device * dev);
 
-static int atao_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int atao_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int atao_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int atao_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int atao_calib_insn_read(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int atao_calib_insn_write(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
 
 static int atao_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        unsigned long iobase;
        int ao_unipolar;
 
@@ -320,8 +320,8 @@ static void atao_reset(struct comedi_device * dev)
        outw(devpriv->cfg1, dev->iobase + ATAO_CFG1);
 }
 
-static int atao_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);
@@ -344,8 +344,8 @@ static int atao_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int atao_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);
@@ -356,8 +356,8 @@ static int atao_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int atao_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -373,8 +373,8 @@ static int atao_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int atao_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec);
        unsigned int mask, bit;
@@ -418,8 +418,8 @@ static int atao_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s
  * DACs.  It is not explicitly stated in the manual how to access
  * the caldacs, but we can guess.
  */
-static int atao_calib_insn_read(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        for (i = 0; i < insn->n; i++) {
@@ -428,8 +428,8 @@ static int atao_calib_insn_read(struct comedi_device * dev, comedi_subdevice * s
        return insn->n;
 }
 
-static int atao_calib_insn_write(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int bitstring, bit;
        unsigned int chan = CR_CHAN(insn->chanspec);