diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-17 02:05:14 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 21:53:56 (GMT) |
commit | 34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch) | |
tree | 9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/kcomedilib | |
parent | 71b5f4f11971dea972832ad63a994c7e5b45db6b (diff) | |
download | linux-fsl-qoriq-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.xz |
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/kcomedilib')
-rw-r--r-- | drivers/staging/comedi/kcomedilib/get.c | 30 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 20 |
2 files changed, 25 insertions, 25 deletions
diff --git a/drivers/staging/comedi/kcomedilib/get.c b/drivers/staging/comedi/kcomedilib/get.c index 257cf8c..8237716 100644 --- a/drivers/staging/comedi/kcomedilib/get.c +++ b/drivers/staging/comedi/kcomedilib/get.c @@ -55,7 +55,7 @@ const char *comedi_get_board_name(void * d) int comedi_get_subdevice_type(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; return s->type; } @@ -63,7 +63,7 @@ int comedi_get_subdevice_type(void *d, unsigned int subdevice) unsigned int comedi_get_subdevice_flags(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; return s->subdev_flags; } @@ -85,7 +85,7 @@ int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd) int comedi_get_n_channels(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; return s->n_chan; } @@ -93,7 +93,7 @@ int comedi_get_n_channels(void *d, unsigned int subdevice) int comedi_get_len_chanlist(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; return s->len_chanlist; } @@ -102,7 +102,7 @@ unsigned int comedi_get_maxdata(void *d, unsigned int subdevice, unsigned int chan) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; if (s->maxdata_list) return s->maxdata_list[chan]; @@ -115,7 +115,7 @@ int comedi_get_rangetype(void *d, unsigned int subdevice, unsigned int chan) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; int ret; if (s->range_table_list) { @@ -133,7 +133,7 @@ int comedi_get_rangetype(void *d, unsigned int subdevice, int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; int ret; if (s->range_table_list) { @@ -152,7 +152,7 @@ int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan, unsigned int range, comedi_krange *krange) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; const comedi_lrange *lr; if (s->range_table_list) { @@ -174,7 +174,7 @@ int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan, unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; async = s->async; @@ -187,7 +187,7 @@ unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice) int comedi_get_buffer_contents(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; unsigned int num_bytes; @@ -207,7 +207,7 @@ int comedi_set_user_int_count(void *d, unsigned int subdevice, unsigned int buf_user_count) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; int num_bytes; @@ -228,7 +228,7 @@ int comedi_mark_buffer_read(void *d, unsigned int subdevice, unsigned int num_bytes) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; if (subdevice >= dev->n_subdevices) @@ -247,7 +247,7 @@ int comedi_mark_buffer_written(void *d, unsigned int subdevice, unsigned int num_bytes) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; int bytes_written; @@ -266,7 +266,7 @@ int comedi_mark_buffer_written(void *d, unsigned int subdevice, int comedi_get_buffer_size(void *d, unsigned int subdev) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdev; + struct comedi_subdevice *s = dev->subdevices + subdev; comedi_async *async; if (subdev >= dev->n_subdevices) @@ -281,7 +281,7 @@ int comedi_get_buffer_size(void *d, unsigned int subdev) int comedi_get_buffer_offset(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices + subdevice; + struct comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; if (subdevice >= dev->n_subdevices) diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 98ddbb6..928e935 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -124,7 +124,7 @@ int comedi_fileno(void *d) int comedi_command(void *d, comedi_cmd *cmd) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; comedi_async *async; unsigned runflags; @@ -164,7 +164,7 @@ int comedi_command(void *d, comedi_cmd *cmd) int comedi_command_test(void *d, comedi_cmd *cmd) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; if (cmd->subdev >= dev->n_subdevices) return -ENODEV; @@ -186,7 +186,7 @@ int comedi_command_test(void *d, comedi_cmd *cmd) int comedi_do_insn(void *d, comedi_insn *insn) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; int ret = 0; if (insn->insn & INSN_MASK_SPECIAL) { @@ -327,7 +327,7 @@ int comedi_do_insn(void *d, comedi_insn *insn) int comedi_lock(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; unsigned long flags; int ret = 0; @@ -370,7 +370,7 @@ int comedi_lock(void *d, unsigned int subdevice) int comedi_unlock(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; unsigned long flags; comedi_async *async; int ret; @@ -422,7 +422,7 @@ int comedi_unlock(void *d, unsigned int subdevice) int comedi_cancel(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; int ret = 0; if (subdevice >= dev->n_subdevices) @@ -468,7 +468,7 @@ int comedi_register_callback(void *d, unsigned int subdevice, unsigned int mask, int (*cb) (unsigned int, void *), void *arg) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; comedi_async *async; if (subdevice >= dev->n_subdevices) @@ -504,7 +504,7 @@ int comedi_register_callback(void *d, unsigned int subdevice, int comedi_poll(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s = dev->subdevices; + struct comedi_subdevice *s = dev->subdevices; comedi_async *async; if (subdevice >= dev->n_subdevices) @@ -531,7 +531,7 @@ int comedi_poll(void *d, unsigned int subdevice) int comedi_map(void *d, unsigned int subdevice, void *ptr) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; if (subdevice >= dev->n_subdevices) return -EINVAL; @@ -553,7 +553,7 @@ int comedi_map(void *d, unsigned int subdevice, void *ptr) int comedi_unmap(void *d, unsigned int subdevice) { struct comedi_device *dev = (struct comedi_device *) d; - comedi_subdevice *s; + struct comedi_subdevice *s; if (subdevice >= dev->n_subdevices) return -EINVAL; |