staging: unisys: refactor visor_signalqueue_empty()

Rename visor_signalqueue_empty() to spar_signalqueue_empty(), and fix
CamelCase parameter names:

pChannel => ch
Queue => queue

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 0b9a7cf..b1e2f95 100644 (file)
--- a/drivers/staging/unisys/channels/channel.c
+++ b/drivers/staging/unisys/channels/channel.c
@@ -207,13 +207,13 @@ SignalRemoveAll(struct channel_header *pChannel, u32 Queue, void *pSignal)
  * Return value:
  * 1 if the signal queue is empty, 0 otherwise.
  */
-unsigned char
-visor_signalqueue_empty(struct channel_header __iomem *pChannel, u32 Queue)
+unsigned char spar_signalqueue_empty(struct channel_header __iomem *ch,
+                                    u32 queue)
 {
        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;
        return readl(&pqhdr->head) == readl(&pqhdr->tail);
 }
-EXPORT_SYMBOL_GPL(visor_signalqueue_empty);
+EXPORT_SYMBOL_GPL(spar_signalqueue_empty);
 

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 15c9ceb..d982afa 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -564,7 +564,7 @@ unsigned int SignalRemoveAll(struct channel_header *pChannel, u32 Queue,
 * Return value:
 * 1 if the signal queue is empty, 0 otherwise.
 */
-unsigned char visor_signalqueue_empty(struct channel_header __iomem *pChannel,
-                                     u32 Queue);
+unsigned char spar_signalqueue_empty(struct channel_header __iomem *ch,
+                                    u32 queue);
 
 #endif

diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index a3da5e9..4015933 100644 (file)
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -438,7 +438,7 @@ virthba_ISR(int irq, void *dev_id)
                mask = ~ULTRA_CHANNEL_ENABLE_INTS;
                rc1 = uisqueue_interlocked_and(virthbainfo->flags_addr, mask);
        }
-       if (visor_signalqueue_empty(pChannelHeader, IOCHAN_FROM_IOPART)) {
+       if (spar_signalqueue_empty(pChannelHeader, IOCHAN_FROM_IOPART)) {
                virthbainfo->interrupts_notme++;
                return IRQ_NONE;
        }