staging: comedi: move COMEDI_SRF_... macros to "comedi_fops.c"

The `COMEDI_SRF_...` macros define flag combinations in the `runflags`
member of `struct comedi_subdevice`.  They are only used directly in
"comedi_fops.c", so move them to there.

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 fc339c5c50fca591cc13c6422affd22d3ecda504..6f269cc35633411803783e28705d60702fddd3d2 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -43,6 +43,23 @@
 
 #include "comedi_internal.h"
 
+/**
+ * comedi_subdevice "runflags"
+ * @COMEDI_SRF_RT:             DEPRECATED: command is running real-time
+ * @COMEDI_SRF_ERROR:          indicates an COMEDI_CB_ERROR event has occurred
+ *                             since the last command was started
+ * @COMEDI_SRF_RUNNING:                command is running
+ * @COMEDI_SRF_FREE_SPRIV:     free s->private on detach
+ *
+ * @COMEDI_SRF_BUSY_MASK:      runflags that indicate the subdevice is "busy"
+ */
+#define COMEDI_SRF_RT          BIT(1)
+#define COMEDI_SRF_ERROR       BIT(2)
+#define COMEDI_SRF_RUNNING     BIT(27)
+#define COMEDI_SRF_FREE_SPRIV  BIT(31)
+
+#define COMEDI_SRF_BUSY_MASK   (COMEDI_SRF_ERROR | COMEDI_SRF_RUNNING)
+
 /**
  * struct comedi_file - per-file private data for comedi device
  * @dev: comedi_device struct

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 52071f7494c450d2ed506255dc39d68f14490246..28f26062a54c7585924c5866871b8e06656c022e 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -303,23 +303,6 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s);
 struct comedi_device *comedi_dev_get_from_minor(unsigned minor);
 int comedi_dev_put(struct comedi_device *dev);
 
-/**
- * comedi_subdevice "runflags"
- * @COMEDI_SRF_RT:             DEPRECATED: command is running real-time
- * @COMEDI_SRF_ERROR:          indicates an COMEDI_CB_ERROR event has occurred
- *                             since the last command was started
- * @COMEDI_SRF_RUNNING:                command is running
- * @COMEDI_SRF_FREE_SPRIV:     free s->private on detach
- *
- * @COMEDI_SRF_BUSY_MASK:      runflags that indicate the subdevice is "busy"
- */
-#define COMEDI_SRF_RT          BIT(1)
-#define COMEDI_SRF_ERROR       BIT(2)
-#define COMEDI_SRF_RUNNING     BIT(27)
-#define COMEDI_SRF_FREE_SPRIV  BIT(31)
-
-#define COMEDI_SRF_BUSY_MASK   (COMEDI_SRF_ERROR | COMEDI_SRF_RUNNING)
-
 bool comedi_is_subdevice_running(struct comedi_subdevice *s);
 
 void *comedi_alloc_spriv(struct comedi_subdevice *s, size_t size);