From 90c2aced3963241ece985111843824fe01f851cb Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 3 May 2010 15:15:06 -0700
Subject: [PATCH] --- yaml --- r: 197197 b: refs/heads/master c:
 181bd67bf5780b941f2cba6247ed1c0cdfce468a h: refs/heads/master i:   197195:
 360c6e762c2d95499f945ea24fd9c2b68f57e0ce v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/comedi/comedi_fops.c | 23 +++++++++++-----------
 trunk/drivers/staging/comedi/comedidev.h   |  2 --
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index c57b43681875..0ca873211243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 472dfe77b91d8026c3ccda22c60db0e92bc27863
+refs/heads/master: 181bd67bf5780b941f2cba6247ed1c0cdfce468a
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index b11f9b08000b..135c80ab6d10 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -954,6 +954,17 @@ static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file)
 	return ret;
 }
 
+static void comedi_set_subdevice_runflags(struct comedi_subdevice *s,
+					  unsigned mask, unsigned bits)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&s->spin_lock, flags);
+	s->runflags &= ~mask;
+	s->runflags |= (bits & mask);
+	spin_unlock_irqrestore(&s->spin_lock, flags);
+}
+
 /*
 	COMEDI_CMD
 	command ioctl
@@ -2021,18 +2032,6 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
 }
 EXPORT_SYMBOL(comedi_event);
 
-void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
-				   unsigned bits)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&s->spin_lock, flags);
-	s->runflags &= ~mask;
-	s->runflags |= (bits & mask);
-	spin_unlock_irqrestore(&s->spin_lock, flags);
-}
-EXPORT_SYMBOL(comedi_set_subdevice_runflags);
-
 unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
 {
 	unsigned long flags;
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 5e4672751d42..9e13964ac6d3 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -383,8 +383,6 @@ enum subdevice_runflags {
 
 int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg);
 int comedi_check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist);
-void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
-				   unsigned bits);
 unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s);
 int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
 	       struct comedi_insn *insn, unsigned int *data);