AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 16:35:13 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: remove comedi_clear_minor()

Browse Source 
`comedi_clear_minor()` calls either `comedi_clear_board_minor()` or
`comedi_clear_subdevice_minor()` depending on its minor device number
parameter.  The one it calls only depends on where it is called from, so
bypass the calls to `comedi_clear_minor()` and remove 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>
This commit is contained in:
Ian Abbott 2013-04-04 14:59:05 +01:00 committed by Greg Kroah-Hartman
parent 5b7dba1bdd
commit ea1cc3973a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/comedi_fops.c
View File

@ -150,14 +150,6 @@ static struct comedi_file_info *comedi_clear_subdevice_minor(unsigned minor)
return info; return info;
} }
static struct comedi_file_info *comedi_clear_minor(unsigned minor)
{
if (minor < COMEDI_NUM_BOARD_MINORS)
return comedi_clear_board_minor(minor);
else
return comedi_clear_subdevice_minor(minor);
}
static void comedi_free_board_file_info(struct comedi_file_info *info) static void comedi_free_board_file_info(struct comedi_file_info *info)
{ {
if (info) { if (info) {
@ -1745,7 +1737,7 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
dev->minor >= comedi_num_legacy_minors) { dev->minor >= comedi_num_legacy_minors) {
/* Successfully unconfigured a dynamically /* Successfully unconfigured a dynamically
* allocated device. Try and remove it. */ * allocated device. Try and remove it. */
info = comedi_clear_minor(dev->minor); info = comedi_clear_board_minor(dev->minor);
if (info) { if (info) {
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
comedi_free_board_file_info(info); comedi_free_board_file_info(info);
@ -2411,7 +2403,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
static void comedi_free_board_minor(unsigned minor) static void comedi_free_board_minor(unsigned minor)
{ {
BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS);
comedi_free_board_file_info(comedi_clear_minor(minor)); comedi_free_board_file_info(comedi_clear_board_minor(minor));
} }
void comedi_release_hardware_device(struct device *hardware_device) void comedi_release_hardware_device(struct device *hardware_device)
@ -2485,7 +2477,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s)
BUG_ON(s->minor >= COMEDI_NUM_MINORS); BUG_ON(s->minor >= COMEDI_NUM_MINORS);
BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS); BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS);
info = comedi_clear_minor(s->minor); info = comedi_clear_subdevice_minor(s->minor);
if (s->class_dev) { if (s->class_dev) {
device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor)); device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor));
s->class_dev = NULL; s->class_dev = NULL;