diff options
| author | Ian Abbott | 2013-04-04 15:59:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-04-05 23:33:21 +0200 |
| commit | dac59de2dd438a54007135ac3c2e6b6b06b5f6d6 (patch) | |
| tree | 8d3fc8053a06b63e7206910cdcfda0db66a952e2 /drivers/staging/comedi/comedi_fops.c | |
| parent | staging: comedi: remove comedi_clear_subdevice_minor() (diff) | |
| download | kernel-qcow2-linux-dac59de2dd438a54007135ac3c2e6b6b06b5f6d6.tar.gz kernel-qcow2-linux-dac59de2dd438a54007135ac3c2e6b6b06b5f6d6.tar.xz kernel-qcow2-linux-dac59de2dd438a54007135ac3c2e6b6b06b5f6d6.zip | |
staging: comedi: remove comedi_file_info_from_board_minor()
Merge the code from `comedi_file_info_from_board_minor()` into
`comedi_dev_from_board_minor()` and remove it since nothing else calls
it.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 64721f7f089b..71156bdfcdc8 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -154,18 +154,6 @@ static void comedi_free_board_file_info(struct comedi_file_info *info) } static struct comedi_file_info -*comedi_file_info_from_board_minor(unsigned minor) -{ - struct comedi_file_info *info; - - BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); - mutex_lock(&comedi_board_minor_table_lock); - info = comedi_board_minor_table[minor]; - mutex_unlock(&comedi_board_minor_table_lock); - return info; -} - -static struct comedi_file_info *comedi_file_info_from_subdevice_minor(unsigned minor) { struct comedi_file_info *info; @@ -188,7 +176,10 @@ static struct comedi_device *comedi_dev_from_board_minor(unsigned minor) { struct comedi_file_info *info; - info = comedi_file_info_from_board_minor(minor); + BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); + mutex_lock(&comedi_board_minor_table_lock); + info = comedi_board_minor_table[minor]; + mutex_unlock(&comedi_board_minor_table_lock); return comedi_dev_from_file_info(info); } |