Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / comedi / kcomedilib / get.c

diff --git a/drivers/staging/comedi/kcomedilib/get.c b/drivers/staging/comedi/kcomedilib/get.c
index 2004ad4480c001bf0291f21e081bc85b9617615a..b6b726a69f14fd02da5246d3b20991292ec0347c 100644 (file)
--- a/drivers/staging/comedi/kcomedilib/get.c
+++ b/drivers/staging/comedi/kcomedilib/get.c
@@ -26,51 +26,51 @@
 #include "../comedilib.h"
 #include "../comedidev.h"
 
-int comedi_get_n_subdevices(comedi_t * d)
+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;
 }
 
-int comedi_get_version_code(comedi_t * d)
+int comedi_get_version_code(void *d)
 {
        return COMEDI_VERSION_CODE;
 }
 
-const char *comedi_get_driver_name(comedi_t * 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(comedi_t * d)
+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(comedi_t * d, unsigned int subdevice)
+int comedi_get_subdevice_type(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
 
        return s->type;
 }
 
-unsigned int comedi_get_subdevice_flags(comedi_t * d, unsigned int subdevice)
+unsigned int comedi_get_subdevice_flags(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
 
        return s->subdev_flags;
 }
 
-int comedi_find_subdevice_by_type(comedi_t * d, int type, unsigned int subd)
+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;
@@ -82,27 +82,27 @@ int comedi_find_subdevice_by_type(comedi_t * d, int type, unsigned int subd)
        return -1;
 }
 
-int comedi_get_n_channels(comedi_t * d, unsigned int subdevice)
+int comedi_get_n_channels(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
 
        return s->n_chan;
 }
 
-int comedi_get_len_chanlist(comedi_t * d, unsigned int subdevice)
+int comedi_get_len_chanlist(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
 
        return s->len_chanlist;
 }
 
-lsampl_t comedi_get_maxdata(comedi_t * d, unsigned int subdevice,
+unsigned int comedi_get_maxdata(void *d, unsigned int subdevice,
        unsigned int chan)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
 
        if (s->maxdata_list)
                return s->maxdata_list[chan];
@@ -111,11 +111,11 @@ lsampl_t comedi_get_maxdata(comedi_t * d, unsigned int subdevice,
 }
 
 #ifdef KCOMEDILIB_DEPRECATED
-int comedi_get_rangetype(comedi_t * d, unsigned int subdevice,
+int comedi_get_rangetype(void *d, unsigned int subdevice,
        unsigned int chan)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
        int ret;
 
        if (s->range_table_list) {
@@ -130,10 +130,10 @@ int comedi_get_rangetype(comedi_t * d, unsigned int subdevice,
 }
 #endif
 
-int comedi_get_n_ranges(comedi_t * d, unsigned int subdevice, unsigned int chan)
+int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
        int ret;
 
        if (s->range_table_list) {
@@ -148,22 +148,22 @@ int comedi_get_n_ranges(comedi_t * d, unsigned int subdevice, unsigned int chan)
 /*
  * ALPHA (non-portable)
 */
-int comedi_get_krange(comedi_t * d, unsigned int subdevice, unsigned int chan,
-       unsigned int range, comedi_krange * krange)
+int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan,
+       unsigned int range, struct comedi_krange *krange)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       const comedi_lrange *lr;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       const struct comedi_lrange *lr;
 
        if (s->range_table_list) {
                lr = s->range_table_list[chan];
        } else {
                lr = s->range_table;
        }
-       if (range >= lr->length) {
+       if (range >= lr->length)
                return -EINVAL;
-       }
-       memcpy(krange, lr->range + range, sizeof(comedi_krange));
+
+       memcpy(krange, lr->range + range, sizeof(struct comedi_krange));
 
        return 0;
 }
@@ -171,11 +171,11 @@ int comedi_get_krange(comedi_t * d, unsigned int subdevice, unsigned int chan,
 /*
  * ALPHA (may be renamed)
 */
-unsigned int comedi_get_buf_head_pos(comedi_t * d, unsigned int subdevice)
+unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
 
        async = s->async;
        if (async == NULL)
@@ -184,11 +184,11 @@ unsigned int comedi_get_buf_head_pos(comedi_t * d, unsigned int subdevice)
        return async->buf_write_count;
 }
 
-int comedi_get_buffer_contents(comedi_t * d, unsigned int subdevice)
+int comedi_get_buffer_contents(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
        unsigned int num_bytes;
 
        if (subdevice >= dev->n_subdevices)
@@ -203,12 +203,12 @@ int comedi_get_buffer_contents(comedi_t * d, unsigned int subdevice)
 /*
  * ALPHA
 */
-int comedi_set_user_int_count(comedi_t * 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;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
        int num_bytes;
 
        async = s->async;
@@ -224,12 +224,12 @@ int comedi_set_user_int_count(comedi_t * d, unsigned int subdevice,
        return 0;
 }
 
-int comedi_mark_buffer_read(comedi_t * d, unsigned int subdevice,
+int comedi_mark_buffer_read(void *d, unsigned int subdevice,
        unsigned int num_bytes)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
 
        if (subdevice >= dev->n_subdevices)
                return -1;
@@ -243,12 +243,12 @@ int comedi_mark_buffer_read(comedi_t * d, unsigned int subdevice,
        return 0;
 }
 
-int comedi_mark_buffer_written(comedi_t * d, unsigned int subdevice,
+int comedi_mark_buffer_written(void *d, unsigned int subdevice,
        unsigned int num_bytes)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
        int bytes_written;
 
        if (subdevice >= dev->n_subdevices)
@@ -263,11 +263,11 @@ int comedi_mark_buffer_written(comedi_t * d, unsigned int subdevice,
        return 0;
 }
 
-int comedi_get_buffer_size(comedi_t * d, unsigned int subdev)
+int comedi_get_buffer_size(void *d, unsigned int subdev)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdev;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdev;
+       struct comedi_async *async;
 
        if (subdev >= dev->n_subdevices)
                return -1;
@@ -278,11 +278,11 @@ int comedi_get_buffer_size(comedi_t * d, unsigned int subdev)
        return async->prealloc_bufsz;
 }
 
-int comedi_get_buffer_offset(comedi_t * d, unsigned int subdevice)
+int comedi_get_buffer_offset(void *d, unsigned int subdevice)
 {
-       comedi_device *dev = (comedi_device *) d;
-       comedi_subdevice *s = dev->subdevices + subdevice;
-       comedi_async *async;
+       struct comedi_device *dev = (struct comedi_device *) d;
+       struct comedi_subdevice *s = dev->subdevices + subdevice;
+       struct comedi_async *async;
 
        if (subdevice >= dev->n_subdevices)
                return -1;