From 3d928a056d35f904ab9d1f7db1c660108dface2b Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 9 Jan 2013 13:31:46 -0700
Subject: [PATCH] --- yaml --- r: 354031 b: refs/heads/master c:
 5b2b64b7510292f4b1e6363edb6f53c39828672e h: refs/heads/master i:   354029:
 aa191e74224c4a1515b05c690dc66ad2e09c8aa6   354027:
 58b499468e99051802eaeecf337c3779fff14844   354023:
 d14434e7508102e68ce41bcc0820a07e609a9531   354015:
 f8150dcdd3bdd0c4989c7d25901f6a837a3ea1cb v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/comedi/comedi_buf.c | 5 +++++
 trunk/drivers/staging/comedi/comedidev.h  | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e23ca1f1aaef..c68c32347dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3abfa1066b9e98df434868eda9ba91d7012d45c6
+refs/heads/master: 5b2b64b7510292f4b1e6363edb6f53c39828672e
diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c
index 70d29016f8c0..891cf89efa91 100644
--- a/trunk/drivers/staging/comedi/comedi_buf.c
+++ b/trunk/drivers/staging/comedi/comedi_buf.c
@@ -309,6 +309,11 @@ unsigned comedi_buf_read_alloc(struct comedi_async *async, unsigned nbytes)
 }
 EXPORT_SYMBOL(comedi_buf_read_alloc);
 
+static unsigned int comedi_buf_read_n_allocated(struct comedi_async *async)
+{
+	return async->buf_read_alloc_count - async->buf_read_count;
+}
+
 /* transfers control of a chunk from reader to free buffer space */
 unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
 {
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index cbfb6147ccec..4d5a35ebc311 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -453,11 +453,6 @@ static inline unsigned comedi_buf_write_n_allocated(struct comedi_async *async)
 	return async->buf_write_alloc_count - async->buf_write_count;
 }
 
-static inline unsigned comedi_buf_read_n_allocated(struct comedi_async *async)
-{
-	return async->buf_read_alloc_count - async->buf_read_count;
-}
-
 int comedi_alloc_subdevice_minor(struct comedi_device *dev,
 				 struct comedi_subdevice *s);
 void comedi_free_subdevice_minor(struct comedi_subdevice *s);