Commit 0b7682ff authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: fix CamelCase names in do_locked_client_insert()

Fix CamelCase names:

pSignal => signal

Remove unused parameters issueInterruptIfEmpty and interruptHandle, and update
callers of this function.
Signed-off-by: default avatarBryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 120758c0
...@@ -263,22 +263,21 @@ EXPORT_SYMBOL_GPL(uisqueue_interlocked_and); ...@@ -263,22 +263,21 @@ 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,
unsigned int whichqueue, unsigned int whichqueue,
void *pSignal, void *signal,
spinlock_t *lock, spinlock_t *lock,
unsigned char issueInterruptIfEmpty, u8 *channel_id)
u64 interruptHandle, u8 *channelId)
{ {
unsigned long flags; unsigned long flags;
u8 rc = 0; u8 rc = 0;
spin_lock_irqsave(lock, flags); spin_lock_irqsave(lock, flags);
if (!spar_channel_client_acquire_os(queueinfo->chan, channelId)) if (!spar_channel_client_acquire_os(queueinfo->chan, channel_id))
goto unlock; goto unlock;
if (spar_signal_insert(queueinfo->chan, whichqueue, pSignal)) { if (spar_signal_insert(queueinfo->chan, whichqueue, signal)) {
queueinfo->packets_sent++; queueinfo->packets_sent++;
rc = 1; rc = 1;
} }
spar_channel_client_release_os(queueinfo->chan, channelId); spar_channel_client_release_os(queueinfo->chan, channel_id);
unlock: unlock:
spin_unlock_irqrestore((spinlock_t *)lock, flags); spin_unlock_irqrestore((spinlock_t *)lock, flags);
return rc; return rc;
...@@ -295,8 +294,7 @@ uisqueue_put_cmdrsp_with_lock_client(struct uisqueue_info *queueinfo, ...@@ -295,8 +294,7 @@ uisqueue_put_cmdrsp_with_lock_client(struct uisqueue_info *queueinfo,
{ {
while (!do_locked_client_insert(queueinfo, whichqueue, cmdrsp, while (!do_locked_client_insert(queueinfo, whichqueue, cmdrsp,
(spinlock_t *)insertlock, (spinlock_t *)insertlock,
issue_irq_if_empty, channel_id)) {
irq_handle, channel_id)) {
if (oktowait != OK_TO_WAIT) { if (oktowait != OK_TO_WAIT) {
LOGERR("****FAILED visor_signal_insert failed; cannot wait; insert aborted\n"); LOGERR("****FAILED visor_signal_insert failed; cannot wait; insert aborted\n");
return 0; /* failed to queue */ return 0; /* failed to queue */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment