From f3abc831386e3606fbb21acf0ee5231df0d0185f Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:12 +0100 Subject: [PATCH] staging: comedi: refactor comedi_dev_from_minor() Refactor `comedi_dev_from_minor()` to call one of two new functions `comedi_dev_from_board_minor()` (for minor device numbers less than `COMEDI_NUM_BOARD_MINORS`) or `comedi_dev_from_subdevice_minor()` (for minor device numbers greater than or equal to `COMEDI_NUM_BOARD_MINORS`, which are subdevice minor device numbers). Remove `comedi_file_info_from_minor()` as it is no longer used. This is a step towards removing `struct comedi_file_info`. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_fops.c | 29 +++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index beb579ddab63..5f3b1524e07d 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -190,23 +190,34 @@ static struct comedi_file_info return info; } -static struct comedi_file_info *comedi_file_info_from_minor(unsigned minor) -{ - if (minor < COMEDI_NUM_BOARD_MINORS) - return comedi_file_info_from_board_minor(minor); - else - return comedi_file_info_from_subdevice_minor(minor); -} - static struct comedi_device * comedi_dev_from_file_info(struct comedi_file_info *info) { return info ? info->device : NULL; } +static struct comedi_device *comedi_dev_from_board_minor(unsigned minor) +{ + struct comedi_file_info *info; + + info = comedi_file_info_from_board_minor(minor); + return comedi_dev_from_file_info(info); +} + +static struct comedi_device *comedi_dev_from_subdevice_minor(unsigned minor) +{ + struct comedi_file_info *info; + + info = comedi_file_info_from_subdevice_minor(minor); + return comedi_dev_from_file_info(info); +} + struct comedi_device *comedi_dev_from_minor(unsigned minor) { - return comedi_dev_from_file_info(comedi_file_info_from_minor(minor)); + if (minor < COMEDI_NUM_BOARD_MINORS) + return comedi_dev_from_board_minor(minor); + else + return comedi_dev_from_subdevice_minor(minor); } EXPORT_SYMBOL_GPL(comedi_dev_from_minor); -- 2.30.2