aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/multiq3.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:05:14 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:56 -0700
commit34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch)
tree9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/drivers/multiq3.c
parent71b5f4f11971dea972832ad63a994c7e5b45db6b (diff)
Staging: comedi: Remove comedi_subdevice typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/multiq3.c')
-rw-r--r--drivers/staging/comedi/drivers/multiq3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 477185b33d7..151d6d4bdde 100644
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -98,7 +98,7 @@ struct multiq3_private {
};
#define devpriv ((struct multiq3_private *)dev->private)
-static int multiq3_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
int i, n;
@@ -134,7 +134,7 @@ static int multiq3_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s
return n;
}
-static int multiq3_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
int i;
@@ -147,7 +147,7 @@ static int multiq3_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s
return i;
}
-static int multiq3_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
int i;
@@ -165,7 +165,7 @@ static int multiq3_ao_insn_write(struct comedi_device * dev, comedi_subdevice *
return i;
}
-static int multiq3_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
if (insn->n != 2)
@@ -176,7 +176,7 @@ static int multiq3_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s
return 2;
}
-static int multiq3_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
if (insn->n != 2)
@@ -191,7 +191,7 @@ static int multiq3_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s
return 2;
}
-static int multiq3_encoder_insn_read(struct comedi_device * dev, comedi_subdevice * s,
+static int multiq3_encoder_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data)
{
int n;
@@ -240,7 +240,7 @@ static int multiq3_attach(struct comedi_device * dev, comedi_devconfig * it)
int result = 0;
unsigned long iobase;
unsigned int irq;
- comedi_subdevice *s;
+ struct comedi_subdevice *s;
iobase = it->options[0];
printk("comedi%d: multiq3: 0x%04lx ", dev->minor, iobase);