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

staging: comedi: remove COMEDI_FIRST_SUBDEVICE_MINOR

Browse source 
The macro `COMEDI_FIRST_SUBDEVICE_MINOR` just expands to another macro
`COMEDI_NUM_BOARD_MINORS`.  Replace uses of
`COMEDI_FIRST_SUBDEVICE_MINOR` with `COMEDI_NUM_BOARD_MINORS` and get
rid of the former.

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:03 +01:00 • committed by Greg Kroah-Hartman
parent eda56825d5
commit 8907cf6c5d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,6 @@
#include "comedi_internal.h"
#define COMEDI_NUM_MINORS 0x100
#define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
#ifdef CONFIG_COMEDI_DEBUG
int comedi_debug;
@ -2400,7 +2399,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)
if (s->subdev_flags & SDF_CMD_WRITE)
info->write_subdevice = s;
mutex_lock(&comedi_file_info_table_lock);
for (i = COMEDI_FIRST_SUBDEVICE_MINOR; i < COMEDI_NUM_MINORS; ++i) {
for (i = COMEDI_NUM_BOARD_MINORS; i < COMEDI_NUM_MINORS; ++i) {
if (comedi_file_info_table[i] == NULL) {
comedi_file_info_table[i] = info;
break;
@ -2433,7 +2432,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s)
return;
BUG_ON(s->minor >= COMEDI_NUM_MINORS);
BUG_ON(s->minor < COMEDI_FIRST_SUBDEVICE_MINOR);
BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS);
info = comedi_clear_minor(s->minor);
if (s->class_dev) {