kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: refactor comedi_dev_from_minor()

Browse source 
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 <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2013-04-04 14:59:12 +01:00 • committed by Greg Kroah-Hartman
parent 5e04c25435
commit f3abc83138
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/staging/comedi/comedi_fops.c
View file

@ -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);