diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:56 -0700 |
commit | 34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch) | |
tree | 9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/drivers/8255.c | |
parent | 71b5f4f11971dea972832ad63a994c7e5b45db6b (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/8255.c')
-rw-r--r-- | drivers/staging/comedi/drivers/8255.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index 3355468266a2..e4920ae934ae 100644 --- a/drivers/staging/comedi/drivers/8255.c +++ b/drivers/staging/comedi/drivers/8255.c @@ -116,9 +116,9 @@ static comedi_driver driver_8255 = { COMEDI_INITCLEANUP(driver_8255); -static void do_config(struct comedi_device *dev, comedi_subdevice * s); +static void do_config(struct comedi_device *dev, struct comedi_subdevice * s); -void subdev_8255_interrupt(struct comedi_device *dev, comedi_subdevice * s) +void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice * s) { short d; @@ -143,7 +143,7 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg) } } -static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s, +static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (data[0]) { @@ -168,7 +168,7 @@ static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s, return 2; } -static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice * s, +static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { unsigned int mask; @@ -205,7 +205,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice * return 1; } -static void do_config(struct comedi_device *dev, comedi_subdevice * s) +static void do_config(struct comedi_device *dev, struct comedi_subdevice * s) { int config; @@ -222,7 +222,7 @@ static void do_config(struct comedi_device *dev, comedi_subdevice * s) CALLBACK_FUNC(1, _8255_CR, config, CALLBACK_ARG); } -static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s, +static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; @@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s, return 0; } -static int subdev_8255_cmd(struct comedi_device *dev, comedi_subdevice * s) +static int subdev_8255_cmd(struct comedi_device *dev, struct comedi_subdevice * s) { /* FIXME */ return 0; } -static int subdev_8255_cancel(struct comedi_device *dev, comedi_subdevice * s) +static int subdev_8255_cancel(struct comedi_device *dev, struct comedi_subdevice * s) { /* FIXME */ return 0; } -int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb) (int, +int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice * s, int (*cb) (int, int, int, unsigned long), unsigned long arg) { s->type = COMEDI_SUBD_DIO; @@ -340,7 +340,7 @@ int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb) return 0; } -int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s, +int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice * s, int (*cb) (int, int, int, unsigned long), unsigned long arg) { int ret; @@ -358,7 +358,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s, return 0; } -void subdev_8255_cleanup(struct comedi_device *dev, comedi_subdevice * s) +void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s) { if (s->private) { if (subdevpriv->have_irq) { @@ -420,7 +420,7 @@ static int dev_8255_detach(struct comedi_device *dev) { int i; unsigned long iobase; - comedi_subdevice *s; + struct comedi_subdevice *s; printk("comedi%d: 8255: remove\n", dev->minor); |