Staging: comedi: Finish removing ni_private typedef

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

diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c
index f633e0d..41983d0 100644 (file)
--- a/drivers/staging/comedi/drivers/pcm3730.c
+++ b/drivers/staging/comedi/drivers/pcm3730.c
@@ -19,18 +19,18 @@ Configuration options:
 
 #include <linux/ioport.h>
 
-#define PCM3730_SIZE 4         // consecutive io port addresses
+#define PCM3730_SIZE 4         /*  consecutive io port addresses */
 
-#define PCM3730_DOA 0          // offsets for each port
+#define PCM3730_DOA 0          /*  offsets for each port */
 #define PCM3730_DOB 2
 #define PCM3730_DOC 3
 #define PCM3730_DIA 0
 #define PCM3730_DIB 2
 #define PCM3730_DIC 3
 
-static int pcm3730_attach(comedi_device * dev, comedi_devconfig * it);
-static int pcm3730_detach(comedi_device * dev);
-static comedi_driver driver_pcm3730 = {
+static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it);
+static int pcm3730_detach(struct comedi_device * dev);
+static struct comedi_driver driver_pcm3730 = {
       driver_name:"pcm3730",
       module:THIS_MODULE,
       attach:pcm3730_attach,
@@ -39,8 +39,8 @@ static comedi_driver driver_pcm3730 = {
 
 COMEDI_INITCLEANUP(driver_pcm3730);
 
-static int pcm3730_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int pcm3730_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -54,8 +54,8 @@ static int pcm3730_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int pcm3730_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int pcm3730_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -63,9 +63,9 @@ static int pcm3730_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int pcm3730_attach(comedi_device * dev, comedi_devconfig * it)
+static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        unsigned long iobase;
 
        iobase = it->options[0];
@@ -141,7 +141,7 @@ static int pcm3730_attach(comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int pcm3730_detach(comedi_device * dev)
+static int pcm3730_detach(struct comedi_device * dev)
 {
        printk("comedi%d: pcm3730: remove\n", dev->minor);