Commit 3346b798 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

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: 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 24fb134d
...@@ -2348,7 +2348,7 @@ void comedi_free_board_minor(unsigned minor) ...@@ -2348,7 +2348,7 @@ void comedi_free_board_minor(unsigned minor)
comedi_free_board_file_info(comedi_clear_minor(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; int minor;
struct comedi_file_info *info; struct comedi_file_info *info;
...@@ -2357,12 +2357,13 @@ int comedi_find_board_minor(struct device *hardware_device) ...@@ -2357,12 +2357,13 @@ int comedi_find_board_minor(struct device *hardware_device)
spin_lock(&comedi_file_info_table_lock); spin_lock(&comedi_file_info_table_lock);
info = comedi_file_info_table[minor]; info = comedi_file_info_table[minor];
if (info && info->hardware_device == hardware_device) { if (info && info->hardware_device == hardware_device) {
comedi_file_info_table[minor] = NULL;
spin_unlock(&comedi_file_info_table_lock); spin_unlock(&comedi_file_info_table_lock);
return minor; comedi_free_board_file_info(info);
break;
} }
spin_unlock(&comedi_file_info_table_lock); spin_unlock(&comedi_file_info_table_lock);
} }
return -ENODEV;
} }
int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)
......
...@@ -10,7 +10,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev, ...@@ -10,7 +10,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,
struct comedi_rangeinfo __user *arg); struct comedi_rangeinfo __user *arg);
int comedi_alloc_board_minor(struct device *hardware_device); int comedi_alloc_board_minor(struct device *hardware_device);
void comedi_free_board_minor(unsigned minor); 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); int comedi_alloc_subdevice_minor(struct comedi_subdevice *s);
void comedi_free_subdevice_minor(struct comedi_subdevice *s); void comedi_free_subdevice_minor(struct comedi_subdevice *s);
......
...@@ -459,14 +459,9 @@ EXPORT_SYMBOL_GPL(comedi_auto_config); ...@@ -459,14 +459,9 @@ EXPORT_SYMBOL_GPL(comedi_auto_config);
void comedi_auto_unconfig(struct device *hardware_device) void comedi_auto_unconfig(struct device *hardware_device)
{ {
int minor;
if (hardware_device == NULL) if (hardware_device == NULL)
return; return;
minor = comedi_find_board_minor(hardware_device); comedi_release_hardware_device(hardware_device);
if (minor < 0)
return;
comedi_free_board_minor(minor);
} }
EXPORT_SYMBOL_GPL(comedi_auto_unconfig); EXPORT_SYMBOL_GPL(comedi_auto_unconfig);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment