Skip to content

Commit

Permalink
Staging: comedi: clean up kcomedilib/get.c
Browse files Browse the repository at this point in the history 
Remove all of the unused functions, leaving only those that are
actually called by in-kernel code.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed May 11, 2010
1 parent 29a915f commit 8a9e77b
Showing 1 changed file with 0 additions and 242 deletions.
242 changes: 0 additions & 242 deletions drivers/staging/comedi/kcomedilib/get.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,48 +26,6 @@
#include "../comedilib.h"
#include "../comedidev.h"

int comedi_get_n_subdevices(void *d)
{
struct comedi_device *dev = (struct comedi_device *)d;

return dev->n_subdevices;
}

int comedi_get_version_code(void *d)
{
return COMEDI_VERSION_CODE;
}

const char *comedi_get_driver_name(void *d)
{
struct comedi_device *dev = (struct comedi_device *)d;

return dev->driver->driver_name;
}

const char *comedi_get_board_name(void *d)
{
struct comedi_device *dev = (struct comedi_device *)d;

return dev->board_name;
}

int comedi_get_subdevice_type(void *d, unsigned int 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(void *d, unsigned int 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(void *d, int type, unsigned int subd)
{
struct comedi_device *dev = (struct comedi_device *)d;
Expand All @@ -91,203 +49,3 @@ int comedi_get_n_channels(void *d, unsigned int subdevice)
return s->n_chan;
}
EXPORT_SYMBOL(comedi_get_n_channels);

int comedi_get_len_chanlist(void *d, unsigned int subdevice)
{
struct comedi_device *dev = (struct comedi_device *)d;
struct comedi_subdevice *s = dev->subdevices + subdevice;

return s->len_chanlist;
}

unsigned int comedi_get_maxdata(void *d, unsigned int subdevice,
unsigned int chan)
{
struct comedi_device *dev = (struct comedi_device *)d;
struct comedi_subdevice *s = dev->subdevices + subdevice;

if (s->maxdata_list)
return s->maxdata_list[chan];

return s->maxdata;
}

#ifdef KCOMEDILIB_DEPRECATED
int comedi_get_rangetype(void *d, unsigned int subdevice, unsigned int chan)
{
struct comedi_device *dev = (struct comedi_device *)d;
struct comedi_subdevice *s = dev->subdevices + subdevice;
int ret;

if (s->range_table_list)
ret = s->range_table_list[chan]->length;
else
ret = s->range_table->length;

ret = ret | (dev->minor << 28) | (subdevice << 24) | (chan << 16);

return ret;
}
#endif

int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan)
{
struct comedi_device *dev = (struct comedi_device *)d;
struct comedi_subdevice *s = dev->subdevices + subdevice;
int ret;

if (s->range_table_list)
ret = s->range_table_list[chan]->length;
else
ret = s->range_table->length;

return ret;
}

/*
* ALPHA (non-portable)
*/
int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan,
unsigned int range, struct comedi_krange *krange)
{
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)
return -EINVAL;

memcpy(krange, lr->range + range, sizeof(struct comedi_krange));

return 0;
}

/*
* ALPHA (may be renamed)
*/
unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice)
{
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)
return 0;

return async->buf_write_count;
}

int comedi_get_buffer_contents(void *d, unsigned int subdevice)
{
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)
return -1;
async = s->async;
if (async == NULL)
return 0;
num_bytes = comedi_buf_read_n_available(s->async);
return num_bytes;
}

/*
* ALPHA
*/
int comedi_set_user_int_count(void *d, unsigned int subdevice,
unsigned int buf_user_count)
{
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;
if (async == NULL)
return -1;

num_bytes = buf_user_count - async->buf_read_count;
if (num_bytes < 0)
return -1;
comedi_buf_read_alloc(async, num_bytes);
comedi_buf_read_free(async, num_bytes);

return 0;
}

int comedi_mark_buffer_read(void *d, unsigned int subdevice,
unsigned int num_bytes)
{
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;
async = s->async;
if (async == NULL)
return -1;

comedi_buf_read_alloc(async, num_bytes);
comedi_buf_read_free(async, num_bytes);

return 0;
}

int comedi_mark_buffer_written(void *d, unsigned int subdevice,
unsigned int num_bytes)
{
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)
return -1;
async = s->async;
if (async == NULL)
return -1;
bytes_written = comedi_buf_write_alloc(async, num_bytes);
comedi_buf_write_free(async, bytes_written);
if (bytes_written != num_bytes)
return -1;
return 0;
}

int comedi_get_buffer_size(void *d, unsigned int subdev)
{
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;
async = s->async;
if (async == NULL)
return 0;

return async->prealloc_bufsz;
}

int comedi_get_buffer_offset(void *d, unsigned int subdevice)
{
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;
async = s->async;
if (async == NULL)
return 0;

return async->buf_read_ptr;
}

0 comments on commit 8a9e77b

Please sign in to comment.