evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: remove comedi_clear_subdevice_minor()

Browse source 
Merge the code from `comedi_clear_subdevice_minor()` into
`comedi_free_subdevice_minor()` and remove it since nothing else calls
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:13 +01:00 • committed by Greg Kroah-Hartman
parent f3abc83138
commit 0fcc9d48a0
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,18 +137,6 @@ static struct comedi_file_info *comedi_clear_board_minor(unsigned minor)
return info; return info;
} }
static struct comedi_file_info *comedi_clear_subdevice_minor(unsigned minor)
{
struct comedi_file_info *info;
unsigned int i = minor - COMEDI_NUM_BOARD_MINORS;
mutex_lock(&comedi_subdevice_minor_table_lock);
info = comedi_subdevice_minor_table[i];
comedi_subdevice_minor_table[i] = NULL;
mutex_unlock(&comedi_subdevice_minor_table_lock);
return info;
}
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) {
@ -2528,6 +2516,7 @@ 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)
{ {
struct comedi_file_info *info; struct comedi_file_info *info;
unsigned int i;
if (s == NULL) if (s == NULL)
return; return;
@ -2537,7 +2526,11 @@ 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_subdevice_minor(s->minor); i = s->minor - COMEDI_NUM_BOARD_MINORS;
mutex_lock(&comedi_subdevice_minor_table_lock);
info = comedi_subdevice_minor_table[i];
comedi_subdevice_minor_table[i] = NULL;
mutex_unlock(&comedi_subdevice_minor_table_lock);
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;