UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Benjamin Romer 2014-09-30 12:07:51 -04:00 committed by Greg Kroah-Hartman
parent e3f3b1f2a0
commit 17f5e49167
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/unisys/include/uisqueue.h
View File

@ -76,10 +76,10 @@ struct uisqueue_info {
".previous\n" \ ".previous\n" \
"661:\n\tlock; " "661:\n\tlock; "
unsigned long long uisqueue_InterlockedOr(unsigned long long __iomem *Target, unsigned long long uisqueue_interlocked_or(unsigned long long __iomem *tgt,
unsigned long long Set); unsigned long long set);
unsigned long long uisqueue_InterlockedAnd(unsigned long long __iomem *Target, unsigned long long uisqueue_interlocked_and(unsigned long long __iomem *tgt,
unsigned long long Set); unsigned long long set);
unsigned int uisqueue_send_int_if_needed(struct uisqueue_info *pqueueinfo, unsigned int uisqueue_send_int_if_needed(struct uisqueue_info *pqueueinfo,
unsigned int whichqueue, unsigned int whichqueue,

20
drivers/staging/unisys/uislib/uisqueue.c
View File

@ -34,40 +34,40 @@
/* Exported functions */ /* Exported functions */
/*****************************************************/ /*****************************************************/
unsigned long long unsigned long long
uisqueue_InterlockedOr(unsigned long long __iomem *Target, uisqueue_interlocked_or(unsigned long long __iomem *tgt,
unsigned long long Set) unsigned long long set)
{ {
unsigned long long i; unsigned long long i;
unsigned long long j; unsigned long long j;
j = readq(Target); j = readq(tgt);
do { do {
i = j; 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); } while (i != j);
return j; return j;
} }
EXPORT_SYMBOL_GPL(uisqueue_InterlockedOr); EXPORT_SYMBOL_GPL(uisqueue_interlocked_or);
unsigned long long unsigned long long
uisqueue_InterlockedAnd(unsigned long long __iomem *Target, uisqueue_interlocked_and(unsigned long long __iomem *tgt,
unsigned long long Set) unsigned long long set)
{ {
unsigned long long i; unsigned long long i;
unsigned long long j; unsigned long long j;
j = readq(Target); j = readq(tgt);
do { do {
i = j; 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); } while (i != j);
return j; return j;
} }
EXPORT_SYMBOL_GPL(uisqueue_InterlockedAnd); EXPORT_SYMBOL_GPL(uisqueue_interlocked_and);
static u8 static u8
do_locked_client_insert(struct uisqueue_info *queueinfo, do_locked_client_insert(struct uisqueue_info *queueinfo,

16
drivers/staging/unisys/virthba/virthba.c
View File

@ -436,7 +436,7 @@ virthba_ISR(int irq, void *dev_id)
0)) { 0)) {
virthbainfo->interrupts_disabled++; virthbainfo->interrupts_disabled++;
mask = ~ULTRA_CHANNEL_ENABLE_INTS; 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)) { if (visor_signalqueue_empty(pChannelHeader, IOCHAN_FROM_IOPART)) {
virthbainfo->interrupts_notme++; virthbainfo->interrupts_notme++;
@ -627,9 +627,9 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
virthbainfo->interrupt_vector); virthbainfo->interrupt_vector);
mask = ~(ULTRA_IO_CHANNEL_IS_POLLING | mask = ~(ULTRA_IO_CHANNEL_IS_POLLING |
ULTRA_IO_DRIVER_DISABLES_INTS); ULTRA_IO_DRIVER_DISABLES_INTS);
uisqueue_InterlockedAnd(Features_addr, mask); uisqueue_interlocked_and(Features_addr, mask);
mask = ULTRA_IO_DRIVER_ENABLES_INTS; mask = ULTRA_IO_DRIVER_ENABLES_INTS;
uisqueue_InterlockedOr(Features_addr, mask); uisqueue_interlocked_or(Features_addr, mask);
rsltq_wait_usecs = 4000000; rsltq_wait_usecs = 4000000;
} }
@ -1353,7 +1353,7 @@ process_incoming_rsps(void *v)
atomic_set(&virthbainfo->interrupt_rcvd, 0); atomic_set(&virthbainfo->interrupt_rcvd, 0);
/* drain queue */ /* drain queue */
drain_queue(virthbainfo, dc, cmdrsp); 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) if (dc->threadinfo.should_stop)
break; break;
} }
@ -1457,16 +1457,16 @@ static ssize_t enable_ints_write(struct file *file,
if (new_value == 1) { if (new_value == 1) {
mask = ~(ULTRA_IO_CHANNEL_IS_POLLING | mask = ~(ULTRA_IO_CHANNEL_IS_POLLING |
ULTRA_IO_DRIVER_DISABLES_INTS); ULTRA_IO_DRIVER_DISABLES_INTS);
uisqueue_InterlockedAnd(Features_addr, mask); uisqueue_interlocked_and(Features_addr, mask);
mask = ULTRA_IO_DRIVER_ENABLES_INTS; mask = ULTRA_IO_DRIVER_ENABLES_INTS;
uisqueue_InterlockedOr(Features_addr, mask); uisqueue_interlocked_or(Features_addr, mask);
rsltq_wait_usecs = 4000000; rsltq_wait_usecs = 4000000;
} else { } else {
mask = ~(ULTRA_IO_DRIVER_ENABLES_INTS | mask = ~(ULTRA_IO_DRIVER_ENABLES_INTS |
ULTRA_IO_DRIVER_DISABLES_INTS); ULTRA_IO_DRIVER_DISABLES_INTS);
uisqueue_InterlockedAnd(Features_addr, mask); uisqueue_interlocked_and(Features_addr, mask);
mask = ULTRA_IO_CHANNEL_IS_POLLING; mask = ULTRA_IO_CHANNEL_IS_POLLING;
uisqueue_InterlockedOr(Features_addr, mask); uisqueue_interlocked_or(Features_addr, mask);
rsltq_wait_usecs = 4000; rsltq_wait_usecs = 4000;
} }
} }