staging: unisys: fix camelcase function uisqueue_InterlockedOr()

Clean up CamelCase names:
uisqueue_InterlockedOr => uisqueue_interlocked_or
Target => tgt
Set => set

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

diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h
index 8983407..c96f7ae 100644 (file)
--- a/drivers/staging/unisys/include/uisqueue.h
+++ b/drivers/staging/unisys/include/uisqueue.h
@@ -76,10 +76,10 @@ struct uisqueue_info {
                ".previous\n"                   \
                "661:\n\tlock; "
 
-unsigned long long uisqueue_InterlockedOr(unsigned long long __iomem *Target,
-                                         unsigned long long Set);
-unsigned long long uisqueue_InterlockedAnd(unsigned long long __iomem *Target,
-                                          unsigned long long Set);
+unsigned long long uisqueue_interlocked_or(unsigned long long __iomem *tgt,
+                                          unsigned long long set);
+unsigned long long uisqueue_interlocked_and(unsigned long long __iomem *tgt,
+                                           unsigned long long set);
 
 unsigned int uisqueue_send_int_if_needed(struct uisqueue_info *pqueueinfo,
                                         unsigned int whichqueue,

diff --git a/drivers/staging/unisys/uislib/uisqueue.c b/drivers/staging/unisys/uislib/uisqueue.c
index 83f8761..b24a78e 100644 (file)
--- a/drivers/staging/unisys/uislib/uisqueue.c
+++ b/drivers/staging/unisys/uislib/uisqueue.c
@@ -34,40 +34,40 @@
 /* Exported functions                                */
 /*****************************************************/
 unsigned long long
-uisqueue_InterlockedOr(unsigned long long __iomem *Target,
-                      unsigned long long Set)
+uisqueue_interlocked_or(unsigned long long __iomem *tgt,
+                      unsigned long long set)
 {
        unsigned long long i;
        unsigned long long j;
 
-       j = readq(Target);
+       j = readq(tgt);
        do {
                i = j;
-               j = cmpxchg((__force unsigned long long *)Target, i, i | Set);
+               j = cmpxchg((__force unsigned long long *)tgt, i, i | set);
 
        } while (i != j);
 
        return j;
 }
-EXPORT_SYMBOL_GPL(uisqueue_InterlockedOr);
+EXPORT_SYMBOL_GPL(uisqueue_interlocked_or);
 
 unsigned long long
-uisqueue_InterlockedAnd(unsigned long long __iomem *Target,
-                       unsigned long long Set)
+uisqueue_interlocked_and(unsigned long long __iomem *tgt,
+                       unsigned long long set)
 {
        unsigned long long i;
        unsigned long long j;
 
-       j = readq(Target);
+       j = readq(tgt);
        do {
                i = j;
-               j = cmpxchg((__force unsigned long long *)Target, i, i & Set);
+               j = cmpxchg((__force unsigned long long *)tgt, i, i & set);
 
        } while (i != j);
 
        return j;
 }
-EXPORT_SYMBOL_GPL(uisqueue_InterlockedAnd);
+EXPORT_SYMBOL_GPL(uisqueue_interlocked_and);
 
 static u8
 do_locked_client_insert(struct uisqueue_info *queueinfo,

diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index ce672c5..938e2c8 100644 (file)
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -436,7 +436,7 @@ virthba_ISR(int irq, void *dev_id)
                0)) {
                virthbainfo->interrupts_disabled++;
                mask = ~ULTRA_CHANNEL_ENABLE_INTS;
-               rc1 = uisqueue_InterlockedAnd(virthbainfo->flags_addr, mask);
+               rc1 = uisqueue_interlocked_and(virthbainfo->flags_addr, mask);
        }
        if (visor_signalqueue_empty(pChannelHeader, IOCHAN_FROM_IOPART)) {
                virthbainfo->interrupts_notme++;
@@ -627,9 +627,9 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
                       virthbainfo->interrupt_vector);
                mask = ~(ULTRA_IO_CHANNEL_IS_POLLING |
                         ULTRA_IO_DRIVER_DISABLES_INTS);
-               uisqueue_InterlockedAnd(Features_addr, mask);
+               uisqueue_interlocked_and(Features_addr, mask);
                mask = ULTRA_IO_DRIVER_ENABLES_INTS;
-               uisqueue_InterlockedOr(Features_addr, mask);
+               uisqueue_interlocked_or(Features_addr, mask);
                rsltq_wait_usecs = 4000000;
        }
 
@@ -1353,7 +1353,7 @@ process_incoming_rsps(void *v)
                atomic_set(&virthbainfo->interrupt_rcvd, 0);
                /* drain queue */
                drain_queue(virthbainfo, dc, cmdrsp);
-               rc1 = uisqueue_InterlockedOr(virthbainfo->flags_addr, mask);
+               rc1 = uisqueue_interlocked_or(virthbainfo->flags_addr, mask);
                if (dc->threadinfo.should_stop)
                        break;
        }
@@ -1457,16 +1457,16 @@ static ssize_t enable_ints_write(struct file *file,
                        if (new_value == 1) {
                                mask = ~(ULTRA_IO_CHANNEL_IS_POLLING |
                                         ULTRA_IO_DRIVER_DISABLES_INTS);
-                               uisqueue_InterlockedAnd(Features_addr, mask);
+                               uisqueue_interlocked_and(Features_addr, mask);
                                mask = ULTRA_IO_DRIVER_ENABLES_INTS;
-                               uisqueue_InterlockedOr(Features_addr, mask);
+                               uisqueue_interlocked_or(Features_addr, mask);
                                rsltq_wait_usecs = 4000000;
                        } else {
                                mask = ~(ULTRA_IO_DRIVER_ENABLES_INTS |
                                         ULTRA_IO_DRIVER_DISABLES_INTS);
-                               uisqueue_InterlockedAnd(Features_addr, mask);
+                               uisqueue_interlocked_and(Features_addr, mask);
                                mask = ULTRA_IO_CHANNEL_IS_POLLING;
-                               uisqueue_InterlockedOr(Features_addr, mask);
+                               uisqueue_interlocked_or(Features_addr, mask);
                                rsltq_wait_usecs = 4000;
                        }
                }