From: Ian Abbott <abbotti@mev.co.uk>
Date: Thu, 4 Apr 2013 13:59:03 +0000 (+0100)
Subject: staging: comedi: remove COMEDI_FIRST_SUBDEVICE_MINOR
X-Git-Tag: upstream/snapshot3+hdmi~5290^2~285
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8907cf6c5da2bb6d877c8ba59f90aff1b72cd814;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

staging: comedi: remove COMEDI_FIRST_SUBDEVICE_MINOR

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>
---

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index e69e9d45..c99b289 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -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) {