Skip to content

Commit

Permalink
staging: comedi: comedi_fops: don't export comedi_get_device_file_info()
Browse files Browse the repository at this point in the history
This function is now only used in comedi_fops.c and does not need
to be exported.

Make it static and move it to avoid forward declarations.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 4da5fa9 commit 87b1ad7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
24 changes: 12 additions & 12 deletions drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ static DEFINE_SPINLOCK(comedi_file_info_table_lock);
static struct comedi_device_file_info
*comedi_file_info_table[COMEDI_NUM_MINORS];

static struct comedi_device_file_info *
comedi_get_device_file_info(unsigned minor)
{
struct comedi_device_file_info *info;

BUG_ON(minor >= COMEDI_NUM_MINORS);
spin_lock(&comedi_file_info_table_lock);
info = comedi_file_info_table[minor];
spin_unlock(&comedi_file_info_table_lock);
return info;
}

struct comedi_device *comedi_dev_from_minor(unsigned minor)
{
struct comedi_device_file_info *info;
Expand Down Expand Up @@ -2540,15 +2552,3 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s)
}
kfree(info);
}

struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor)
{
struct comedi_device_file_info *info;

BUG_ON(minor >= COMEDI_NUM_MINORS);
spin_lock(&comedi_file_info_table_lock);
info = comedi_file_info_table[minor];
spin_unlock(&comedi_file_info_table_lock);
return info;
}
EXPORT_SYMBOL_GPL(comedi_get_device_file_info);
2 changes: 0 additions & 2 deletions drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ enum comedi_minor_bits {
static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4;
static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1;

struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor);

struct comedi_device *comedi_dev_from_minor(unsigned minor);

int comedi_alloc_subdevices(struct comedi_device *, int);
Expand Down

0 comments on commit 87b1ad7

Please sign in to comment.