Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17f5e491 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: fix camelcase function uisqueue_InterlockedOr() 



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

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3f3b1f2

drivers/staging/unisys/include/uisqueue.h

+4 −4
Original line number Diff line number Diff line
@@ -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,

drivers/staging/unisys/uislib/uisqueue.c

+10 −10
Original line number Diff line number Diff line
@@ -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,

drivers/staging/unisys/virthba/virthba.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

			}

		}