Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3abc831 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e04c254

drivers/staging/comedi/comedi_fops.c

+20 −9
Original line number Diff line number Diff line
@@ -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);