redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: unisys: refactor visor_signal_remove()

Browse source 
Rename visor_signal_remove() to spar_signal_remove() and fix CamelCase
parameter names:

pChannel => ch
Queue => queue
pSignal => sig

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-10-23 14:30:06 -04:00 committed by Greg Kroah-Hartman
parent 93a8456556
commit 3f12c5f959
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/unisys/channels/channel.c
View file

@ -102,14 +102,13 @@ EXPORT_SYMBOL_GPL(spar_signal_insert);
* 1 if the removal succeeds, 0 if the queue was empty.
*/
unsigned char
visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
void *pSignal)
spar_signal_remove(struct channel_header __iomem *ch, u32 queue, void *sig)
{
void __iomem *psource;
unsigned int head, tail;
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;
/* capture current head and tail */
head = readl(&pqhdr->head);
@ -127,7 +126,7 @@ visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
/* copy signal from tail location to the area pointed to by pSignal */
psource = (char __iomem *) pqhdr + readq(&pqhdr->sig_base_offset) +
(tail * readl(&pqhdr->signal_size));
memcpy_fromio(pSignal, psource, readl(&pqhdr->signal_size));
memcpy_fromio(sig, psource, readl(&pqhdr->signal_size));
mb(); /* channel synch */
writel(tail, &pqhdr->tail);
@ -136,7 +135,7 @@ visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue,
&pqhdr->num_received);
return 1;
}
EXPORT_SYMBOL_GPL(visor_signal_remove);
EXPORT_SYMBOL_GPL(spar_signal_remove);
/*
* Routine Description:

2
drivers/staging/unisys/channels/chanstub.c
View file

@ -61,7 +61,7 @@ SignalRemove_withLock(struct channel_header __iomem *pChannel, u32 Queue,
unsigned char result;
spin_lock(lock);
result = visor_signal_remove(pChannel, Queue, pSignal);
result = spar_signal_remove(pChannel, Queue, pSignal);
spin_unlock(lock);
return result;
}

4
drivers/staging/unisys/common-spar/include/channels/channel.h
View file

@ -528,8 +528,8 @@ unsigned char spar_signal_insert(struct channel_header __iomem *ch, u32 queue,
* empty.
*/
unsigned char visor_signal_remove(struct channel_header __iomem *pChannel,
u32 Queue, void *pSignal);
unsigned char spar_signal_remove(struct channel_header __iomem *ch, u32 queue,
void *sig);
/*
* Routine Description:

2
drivers/staging/unisys/uislib/uisqueue.c
View file

@ -125,7 +125,7 @@ int
uisqueue_get_cmdrsp(struct uisqueue_info *queueinfo,
void *cmdrsp, unsigned int whichqueue)
{
if (!visor_signal_remove(queueinfo->chan, whichqueue, cmdrsp))
if (!spar_signal_remove(queueinfo->chan, whichqueue, cmdrsp))
return 0;
queueinfo->packets_received++;