From e4bc6ca7424514b8b48bb5d3da85c272c68b3bf5 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@jak-linux.org>
Date: Tue, 27 Sep 2011 19:00:48 +0200
Subject: [PATCH] --- yaml --- r: 268565 b: refs/heads/master c:
 0b1076c4b2a06e517fafbb2b4704f23e69b05386 h: refs/heads/master i:   268563:
 b98f78dc887ffc22aae8f3b8a7844ee6abc36da0 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/nvec/nvec.c | 23 +++++++++++++++++++++++
 trunk/drivers/staging/nvec/nvec.h |  6 ++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d1f7ae21a484..e675713e05b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b414e2eb3a487c901c6e0c515753fc0905784eac
+refs/heads/master: 0b1076c4b2a06e517fafbb2b4704f23e69b05386
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index 43a83a953d46..fb0f51a2b0bf 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -17,6 +17,7 @@
 
 #include <asm/irq.h>
 
+#include <linux/atomic.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -91,6 +92,28 @@ static int nvec_status_notifier(struct notifier_block *nb,
 	return NOTIFY_OK;
 }
 
+static struct nvec_msg *nvec_msg_alloc(struct nvec_chip *nvec)
+{
+	int i;
+
+	for (i = 0; i < NVEC_POOL_SIZE; i++) {
+		if (atomic_xchg(&nvec->msg_pool[i].used, 1) == 0) {
+			dev_vdbg(nvec->dev, "INFO: Allocate %i\n", i);
+			return &nvec->msg_pool[i];
+		}
+	}
+
+	dev_err(nvec->dev, "could not allocate buffer\n");
+
+	return NULL;
+}
+
+static void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
+{
+	dev_vdbg(nvec->dev, "INFO: Free %ti\n", msg - nvec->msg_pool);
+	atomic_set(&msg->used, 0);
+}
+
 void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
 			short size)
 {
diff --git a/trunk/drivers/staging/nvec/nvec.h b/trunk/drivers/staging/nvec/nvec.h
index fe11225bcec1..544080259e2c 100644
--- a/trunk/drivers/staging/nvec/nvec.h
+++ b/trunk/drivers/staging/nvec/nvec.h
@@ -16,9 +16,13 @@
 #ifndef __LINUX_MFD_NVEC
 #define __LINUX_MFD_NVEC
 
+#include <linux/atomic.h>
 #include <linux/notifier.h>
 #include <linux/semaphore.h>
 
+/* NVEC_POOL_SIZE - Size of the pool in &struct nvec_msg */
+#define NVEC_POOL_SIZE	64
+
 typedef enum {
 	NVEC_2BYTES,
 	NVEC_3BYTES,
@@ -52,6 +56,7 @@ struct nvec_msg {
 	unsigned short size;
 	unsigned short pos;
 	struct list_head node;
+	atomic_t used;
 };
 
 struct nvec_subdev {
@@ -78,6 +83,7 @@ struct nvec_chip {
 	struct notifier_block nvec_status_notifier;
 	struct work_struct rx_work, tx_work;
 	struct nvec_msg *rx, *tx;
+	struct nvec_msg msg_pool[NVEC_POOL_SIZE];
 
 	/* sync write stuff */
 	struct semaphore sync_write_mutex;