staging: unisys: refactor visor_signal_remove()

Rename visor_signal_remove() to spar_signal_remove() and fix CamelCase
parameter names:

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

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 4737b77476e18c4e170bef1d1da3beb1a612c48f..0b9a7cf35698127f22caded74fa1c8480e658e7b 100644 (file)
--- a/drivers/staging/unisys/channels/channel.c
+++ b/drivers/staging/unisys/channels/channel.c
@@ -102,14 +102,13 @@ EXPORT_SYMBOL_GPL(spar_signal_insert);
  * 1 if the removal succeeds, 0 if the queue was empty.
  */
 unsigned char
-visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
-                   void *pSignal)
+spar_signal_remove(struct channel_header __iomem *ch, u32 queue, void *sig)
 {
        void __iomem *psource;
        unsigned int head, tail;
        struct signal_queue_header __iomem *pqhdr =
-           (struct signal_queue_header __iomem *) ((char __iomem *) pChannel +
-                                   readq(&pChannel->ch_space_offset)) + Queue;
+           (struct signal_queue_header __iomem *) ((char __iomem *) ch +
+                                   readq(&ch->ch_space_offset)) + queue;
 
        /* capture current head and tail */
        head = readl(&pqhdr->head);
@@ -127,7 +126,7 @@ visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
        /* copy signal from tail location to the area pointed to by pSignal */
        psource = (char __iomem *) pqhdr + readq(&pqhdr->sig_base_offset) +
                (tail * readl(&pqhdr->signal_size));
-       memcpy_fromio(pSignal, psource, readl(&pqhdr->signal_size));
+       memcpy_fromio(sig, psource, readl(&pqhdr->signal_size));
 
        mb(); /* channel synch */
        writel(tail, &pqhdr->tail);
@@ -136,7 +135,7 @@ visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
               &pqhdr->num_received);
        return 1;
 }
-EXPORT_SYMBOL_GPL(visor_signal_remove);
+EXPORT_SYMBOL_GPL(spar_signal_remove);
 
 /*
  * Routine Description:

diff --git a/drivers/staging/unisys/channels/chanstub.c b/drivers/staging/unisys/channels/chanstub.c
index fae9ab3d0f608536c3ba65dbd67418507b1465ed..b6fd126f16f1e8bf0954abce1c1043cffa4c8160 100644 (file)
--- a/drivers/staging/unisys/channels/chanstub.c
+++ b/drivers/staging/unisys/channels/chanstub.c
@@ -61,7 +61,7 @@ SignalRemove_withLock(struct channel_header __iomem *pChannel, u32 Queue,
        unsigned char result;
 
        spin_lock(lock);
-       result = visor_signal_remove(pChannel, Queue, pSignal);
+       result = spar_signal_remove(pChannel, Queue, pSignal);
        spin_unlock(lock);
        return result;
 }

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 16dd7a3394331ce6b92c2cf996b1aca3ff88a75c..15c9cebcb8ecf85b336e6ddbbe1250d3cf453301 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -528,8 +528,8 @@ unsigned char spar_signal_insert(struct channel_header __iomem *ch, u32 queue,
 * empty.
 */
 
-unsigned char visor_signal_remove(struct channel_header __iomem *pChannel,
-                                 u32 Queue, void *pSignal);
+unsigned char spar_signal_remove(struct channel_header __iomem *ch, u32 queue,
+                                void *sig);
 
 /*
 * Routine Description:

diff --git a/drivers/staging/unisys/uislib/uisqueue.c b/drivers/staging/unisys/uislib/uisqueue.c
index 66da828ca35233cb9cdafb4c84ec2c82ff087c2a..f9f8442d58c5c0b91c68cb0dd0d9fc26b8768407 100644 (file)
--- a/drivers/staging/unisys/uislib/uisqueue.c
+++ b/drivers/staging/unisys/uislib/uisqueue.c
@@ -125,7 +125,7 @@ int
 uisqueue_get_cmdrsp(struct uisqueue_info *queueinfo,
                    void *cmdrsp, unsigned int whichqueue)
 {
-       if (!visor_signal_remove(queueinfo->chan, whichqueue, cmdrsp))
+       if (!spar_signal_remove(queueinfo->chan, whichqueue, cmdrsp))
                return 0;
 
        queueinfo->packets_received++;