From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Thu, 23 Oct 2014 18:30:10 +0000 (-0400)
Subject: staging: unisys: refactor SignalRemoveAll()
X-Git-Tag: v3.19-rc1~66^2~986
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c11cf5fd0fb2fb12976be62ae13f0d86b6907509;p=karo-tx-linux.git

staging: unisys: refactor SignalRemoveAll()

Rename SignalRemoveAll to spar_signal_remove_all(), and fix CamelCase
names:

pChannel => ch
Queue => queue
pSignal => sig
signalCount => count

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/channels/channel.c b/drivers/staging/unisys/channels/channel.c
index b1e2f9568540..2fc61a74ee54 100644
--- a/drivers/staging/unisys/channels/channel.c
+++ b/drivers/staging/unisys/channels/channel.c
@@ -156,14 +156,14 @@ EXPORT_SYMBOL_GPL(spar_signal_remove);
  * Return value:
  * # of signals copied.
  */
-unsigned int
-SignalRemoveAll(struct channel_header *pChannel, u32 Queue, void *pSignal)
+unsigned int spar_signal_remove_all(struct channel_header *ch, u32 queue,
+				    void *sig)
 {
 	void *psource;
-	unsigned int head, tail, signalCount = 0;
+	unsigned int head, tail, count = 0;
 	struct signal_queue_header *pqhdr =
-	    (struct signal_queue_header *) ((char *) pChannel +
-				    pChannel->ch_space_offset) + Queue;
+	    (struct signal_queue_header *) ((char *) ch +
+				    ch->ch_space_offset) + queue;
 
 	/* capture current head and tail */
 	head = pqhdr->head;
@@ -183,17 +183,17 @@ SignalRemoveAll(struct channel_header *pChannel, u32 Queue, void *pSignal)
 		psource =
 		    (char *) pqhdr + pqhdr->sig_base_offset +
 		    (tail * pqhdr->signal_size);
-		memcpy((char *) pSignal + (pqhdr->signal_size * signalCount),
+		memcpy((char *) sig + (pqhdr->signal_size * count),
 		       psource, pqhdr->signal_size);
 
 		mb(); /* channel synch */
 		pqhdr->tail = tail;
 
-		signalCount++;
+		count++;
 		pqhdr->num_received++;
 	}
 
-	return signalCount;
+	return count;
 }
 
 /*
diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 4d9e5d457e93..865d9a4883a3 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -550,8 +550,8 @@ unsigned char spar_signal_remove(struct channel_header __iomem *ch, u32 queue,
 * Return value:
 * # of signals copied.
 */
-unsigned int SignalRemoveAll(struct channel_header *pChannel, u32 Queue,
-			     void *pSignal);
+unsigned int spar_signal_remove_all(struct channel_header *ch, u32 queue,
+				    void *sig);
 
 /*
 * Routine Description: