OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: add comedi_release_hardware_device() 

Add `comedi_release_hardware_device()` as a replacement for the call
sequence `comedi_find_board_minor()`, `comedi_free_board_minor()`.  This
is slightly safer as we can make sure nothing funny happens to the found
`comedi_file_info_table[]` entry in the middle of the sequence.  Change
`comedi_auto_unconfig()` to call the new function instead of the old
sequence.  Remove `comedi_find_board_minor()` as it has no other
callers.

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:58:47 +01:00 committed by Greg Kroah-Hartman
parent 24fb134d1c
commit 3346b798f2
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2348,7 +2348,7 @@ void comedi_free_board_minor(unsigned minor)
comedi_free_board_file_info(comedi_clear_minor(minor));
}
int comedi_find_board_minor(struct device *hardware_device)
void comedi_release_hardware_device(struct device *hardware_device)
{
int minor;
struct comedi_file_info *info;
@ -2357,12 +2357,13 @@ int comedi_find_board_minor(struct device *hardware_device)
spin_lock(&comedi_file_info_table_lock);
info = comedi_file_info_table[minor];
if (info && info->hardware_device == hardware_device) {
comedi_file_info_table[minor] = NULL;
spin_unlock(&comedi_file_info_table_lock);
return minor;
comedi_free_board_file_info(info);
break;
}
spin_unlock(&comedi_file_info_table_lock);
}
return -ENODEV;
}
int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)

2
drivers/staging/comedi/comedi_internal.h
View File

@ -10,7 +10,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,
struct comedi_rangeinfo __user *arg);
int comedi_alloc_board_minor(struct device *hardware_device);
void comedi_free_board_minor(unsigned minor);
int comedi_find_board_minor(struct device *hardware_device);
void comedi_release_hardware_device(struct device *hardware_device);
int comedi_alloc_subdevice_minor(struct comedi_subdevice *s);
void comedi_free_subdevice_minor(struct comedi_subdevice *s);

7
drivers/staging/comedi/drivers.c
View File

@ -459,14 +459,9 @@ EXPORT_SYMBOL_GPL(comedi_auto_config);
void comedi_auto_unconfig(struct device *hardware_device)
{
int minor;
if (hardware_device == NULL)
return;
minor = comedi_find_board_minor(hardware_device);
if (minor < 0)
return;
comedi_free_board_minor(minor);
comedi_release_hardware_device(hardware_device);
}
EXPORT_SYMBOL_GPL(comedi_auto_unconfig);