summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/das6402.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:05:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:56 -0700
commit71b5f4f11971dea972832ad63a994c7e5b45db6b (patch)
treea96c8f252e3109b42f9074a9a477c23ce9745ebb /drivers/staging/comedi/drivers/das6402.c
parent790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (diff)
Staging: comedi: Remove comedi_device 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/das6402.c')
-rw-r--r--drivers/staging/comedi/drivers/das6402.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 85959c09679f..e78d9eb0eb7a 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -98,8 +98,8 @@ This driver has suffered bitrot.
#define C2 0x80
#define RWLH 0x30
-static int das6402_attach(comedi_device * dev, comedi_devconfig * it);
-static int das6402_detach(comedi_device * dev);
+static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int das6402_detach(struct comedi_device * dev);
static comedi_driver driver_das6402 = {
driver_name:"das6402",
module:THIS_MODULE,
@@ -116,9 +116,9 @@ typedef struct {
} das6402_private;
#define devpriv ((das6402_private *)dev->private)
-static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s);
+static void das6402_ai_fifo_dregs(struct comedi_device * dev, comedi_subdevice * s);
-static void das6402_setcounter(comedi_device * dev)
+static void das6402_setcounter(struct comedi_device * dev)
{
BYTE p;
unsigned short ctrlwrd;
@@ -153,7 +153,7 @@ static void das6402_setcounter(comedi_device * dev)
static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG)
{
- comedi_device *dev = d;
+ struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices;
if (!dev->attached || devpriv->das6402_ignoreirq) {
@@ -186,7 +186,7 @@ static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG)
}
#if 0
-static void das6402_ai_fifo_read(comedi_device * dev, short * data, int n)
+static void das6402_ai_fifo_read(struct comedi_device * dev, short * data, int n)
{
int i;
@@ -195,7 +195,7 @@ static void das6402_ai_fifo_read(comedi_device * dev, short * data, int n)
}
#endif
-static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s)
+static void das6402_ai_fifo_dregs(struct comedi_device * dev, comedi_subdevice * s)
{
while (1) {
if (!(inb(dev->iobase + 8) & 0x01))
@@ -204,7 +204,7 @@ static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s)
}
}
-static int das6402_ai_cancel(comedi_device * dev, comedi_subdevice * s)
+static int das6402_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{
/*
* This function should reset the board from whatever condition it
@@ -226,7 +226,7 @@ static int das6402_ai_cancel(comedi_device * dev, comedi_subdevice * s)
}
#ifdef unused
-static int das6402_ai_mode2(comedi_device * dev, comedi_subdevice * s,
+static int das6402_ai_mode2(struct comedi_device * dev, comedi_subdevice * s,
comedi_trig * it)
{
devpriv->das6402_ignoreirq = 1;
@@ -249,7 +249,7 @@ static int das6402_ai_mode2(comedi_device * dev, comedi_subdevice * s,
}
#endif
-static int board_init(comedi_device * dev)
+static int board_init(struct comedi_device * dev)
{
BYTE b;
@@ -289,7 +289,7 @@ static int board_init(comedi_device * dev)
return 0;
}
-static int das6402_detach(comedi_device * dev)
+static int das6402_detach(struct comedi_device * dev)
{
if (dev->irq)
comedi_free_irq(dev->irq, dev);
@@ -299,7 +299,7 @@ static int das6402_detach(comedi_device * dev)
return 0;
}
-static int das6402_attach(comedi_device * dev, comedi_devconfig * it)
+static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it)
{
unsigned int irq;
unsigned long iobase;