Staging: comedi: Remove comedi_subdevice typedef

[pandora-kernel.git] / drivers / staging / comedi / drivers / fl512.c

diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index 2670998..54f2c2a 100644 (file)
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -40,8 +40,8 @@ static const comedi_lrange range_fl512 = { 4, {
        }
 };
 
-static int fl512_attach(comedi_device * dev, comedi_devconfig * it);
-static int fl512_detach(comedi_device * dev);
+static int fl512_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int fl512_detach(struct comedi_device * dev);
 
 static comedi_driver driver_fl512 = {
       driver_name:"fl512",
@@ -52,18 +52,18 @@ static comedi_driver driver_fl512 = {
 
 COMEDI_INITCLEANUP(driver_fl512);
 
-static int fl512_ai_insn(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
-static int fl512_ao_insn(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
-static int fl512_ao_insn_readback(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
+static int fl512_ai_insn(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
+static int fl512_ao_insn(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
+static int fl512_ao_insn_readback(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
 
 /*
  * fl512_ai_insn : this is the analog input function
  */
-static int fl512_ai_insn(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+static int fl512_ai_insn(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        int n;
        unsigned int lo_byte, hi_byte;
@@ -87,8 +87,8 @@ static int fl512_ai_insn(comedi_device * dev,
 /*
  * fl512_ao_insn : used to write to a DA port n times
  */
-static int fl512_ao_insn(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+static int fl512_ao_insn(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        int n;
        int chan = CR_CHAN(insn->chanspec);     /* get chan to write */
@@ -108,8 +108,8 @@ static int fl512_ao_insn(comedi_device * dev,
  * fl512_ao_insn_readback : used to read previous values written to
  * DA port
  */
-static int fl512_ao_insn_readback(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+static int fl512_ao_insn_readback(struct comedi_device * dev,
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        int n;
        int chan = CR_CHAN(insn->chanspec);
@@ -124,10 +124,10 @@ static int fl512_ao_insn_readback(comedi_device * dev,
 /*
  * start attach
  */
-static int fl512_attach(comedi_device * dev, comedi_devconfig * it)
+static int fl512_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
        unsigned long iobase;
-       comedi_subdevice *s;    /* pointer to the subdevice:
+       struct comedi_subdevice *s;     /* pointer to the subdevice:
                                   Analog in, Analog out, ( not made ->and Digital IO) */
 
        iobase = it->options[0];
@@ -175,7 +175,7 @@ static int fl512_attach(comedi_device * dev, comedi_devconfig * it)
        return 1;
 }
 
-static int fl512_detach(comedi_device * dev)
+static int fl512_detach(struct comedi_device * dev)
 {
        if (dev->iobase)
                release_region(dev->iobase, FL512_SIZE);