diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:56 -0700 |
commit | 71b5f4f11971dea972832ad63a994c7e5b45db6b (patch) | |
tree | a96c8f252e3109b42f9074a9a477c23ce9745ebb /drivers/staging/comedi/kcomedilib | |
parent | 790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (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/kcomedilib')
-rw-r--r-- | drivers/staging/comedi/kcomedilib/get.c | 38 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 28 |
2 files changed, 33 insertions, 33 deletions
diff --git a/drivers/staging/comedi/kcomedilib/get.c b/drivers/staging/comedi/kcomedilib/get.c index 4bb32593a79d..257cf8c25564 100644 --- a/drivers/staging/comedi/kcomedilib/get.c +++ b/drivers/staging/comedi/kcomedilib/get.c @@ -28,7 +28,7 @@ int comedi_get_n_subdevices(void *d) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; return dev->n_subdevices; } @@ -40,21 +40,21 @@ int comedi_get_version_code(void *d) const char *comedi_get_driver_name(void * d) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; return dev->driver->driver_name; } const char *comedi_get_board_name(void * d) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; return dev->board_name; } int comedi_get_subdevice_type(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; return s->type; @@ -62,7 +62,7 @@ int comedi_get_subdevice_type(void *d, unsigned int subdevice) unsigned int comedi_get_subdevice_flags(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; return s->subdev_flags; @@ -70,7 +70,7 @@ unsigned int comedi_get_subdevice_flags(void *d, unsigned int subdevice) int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; if (subd > dev->n_subdevices) return -ENODEV; @@ -84,7 +84,7 @@ int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd) int comedi_get_n_channels(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; return s->n_chan; @@ -92,7 +92,7 @@ int comedi_get_n_channels(void *d, unsigned int subdevice) int comedi_get_len_chanlist(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; return s->len_chanlist; @@ -101,7 +101,7 @@ int comedi_get_len_chanlist(void *d, unsigned int subdevice) unsigned int comedi_get_maxdata(void *d, unsigned int subdevice, unsigned int chan) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; if (s->maxdata_list) @@ -114,7 +114,7 @@ unsigned int comedi_get_maxdata(void *d, unsigned int subdevice, int comedi_get_rangetype(void *d, unsigned int subdevice, unsigned int chan) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; int ret; @@ -132,7 +132,7 @@ int comedi_get_rangetype(void *d, unsigned int subdevice, int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; int ret; @@ -151,7 +151,7 @@ int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan) int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan, unsigned int range, comedi_krange *krange) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; const comedi_lrange *lr; @@ -173,7 +173,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) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; @@ -186,7 +186,7 @@ unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice) int comedi_get_buffer_contents(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; unsigned int num_bytes; @@ -206,7 +206,7 @@ int comedi_get_buffer_contents(void *d, unsigned int subdevice) int comedi_set_user_int_count(void *d, unsigned int subdevice, unsigned int buf_user_count) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; int num_bytes; @@ -227,7 +227,7 @@ int comedi_set_user_int_count(void *d, unsigned int subdevice, int comedi_mark_buffer_read(void *d, unsigned int subdevice, unsigned int num_bytes) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; @@ -246,7 +246,7 @@ int comedi_mark_buffer_read(void *d, unsigned int subdevice, int comedi_mark_buffer_written(void *d, unsigned int subdevice, unsigned int num_bytes) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; int bytes_written; @@ -265,7 +265,7 @@ int comedi_mark_buffer_written(void *d, unsigned int subdevice, int comedi_get_buffer_size(void *d, unsigned int subdev) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdev; comedi_async *async; @@ -280,7 +280,7 @@ int comedi_get_buffer_size(void *d, unsigned int subdev) int comedi_get_buffer_offset(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices + subdevice; comedi_async *async; diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 0320a0ce74e9..98ddbb61ac01 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -45,7 +45,7 @@ MODULE_LICENSE("GPL"); void *comedi_open(const char *filename) { struct comedi_device_file_info *dev_file_info; - comedi_device *dev; + struct comedi_device *dev; unsigned int minor; if (strncmp(filename, "/dev/comedi", 11) != 0) @@ -73,7 +73,7 @@ void *comedi_open(const char *filename) void *comedi_open_old(unsigned int minor) { struct comedi_device_file_info *dev_file_info; - comedi_device *dev; + struct comedi_device *dev; if (minor >= COMEDI_NUM_MINORS) return NULL; @@ -91,7 +91,7 @@ void *comedi_open_old(unsigned int minor) int comedi_close(void *d) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; module_put(dev->driver->module); @@ -115,7 +115,7 @@ char *comedi_strerror(int err) int comedi_fileno(void *d) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; /* return something random */ return dev->minor; @@ -123,7 +123,7 @@ int comedi_fileno(void *d) int comedi_command(void *d, comedi_cmd *cmd) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; comedi_async *async; unsigned runflags; @@ -163,7 +163,7 @@ int comedi_command(void *d, comedi_cmd *cmd) int comedi_command_test(void *d, comedi_cmd *cmd) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; if (cmd->subdev >= dev->n_subdevices) @@ -185,7 +185,7 @@ int comedi_command_test(void *d, comedi_cmd *cmd) */ int comedi_do_insn(void *d, comedi_insn *insn) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; int ret = 0; @@ -326,7 +326,7 @@ int comedi_do_insn(void *d, comedi_insn *insn) */ int comedi_lock(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; unsigned long flags; int ret = 0; @@ -369,7 +369,7 @@ int comedi_lock(void *d, unsigned int subdevice) */ int comedi_unlock(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; unsigned long flags; comedi_async *async; @@ -421,7 +421,7 @@ int comedi_unlock(void *d, unsigned int subdevice) */ int comedi_cancel(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; int ret = 0; @@ -467,7 +467,7 @@ int comedi_cancel(void *d, unsigned int subdevice) int comedi_register_callback(void *d, unsigned int subdevice, unsigned int mask, int (*cb) (unsigned int, void *), void *arg) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; comedi_async *async; @@ -503,7 +503,7 @@ int comedi_register_callback(void *d, unsigned int subdevice, int comedi_poll(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s = dev->subdevices; comedi_async *async; @@ -530,7 +530,7 @@ int comedi_poll(void *d, unsigned int subdevice) /* WARNING: not portable */ int comedi_map(void *d, unsigned int subdevice, void *ptr) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; if (subdevice >= dev->n_subdevices) @@ -552,7 +552,7 @@ int comedi_map(void *d, unsigned int subdevice, void *ptr) /* WARNING: not portable */ int comedi_unmap(void *d, unsigned int subdevice) { - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; comedi_subdevice *s; if (subdevice >= dev->n_subdevices) |