From dac59de2dd438a54007135ac3c2e6b6b06b5f6d6 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:14 +0100 Subject: [PATCH] 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_fops.c | 17 ++++------------- 1 file 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 @@ -153,18 +153,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) { @@ -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); } -- 2.39.5