renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-08 13:44:01 +08:00
Code

staging: unisys: refactor ULTRA_channel_client_release_os()

Browse Source 
Remove the unnecessary macro ULTRA_CHANNEL_CLIENT_RELEASE_OS(), rename
the function to spar_channel_client_release_os(), fix references to the
macro to call the function directly instead, remove the unnecessary
logCtx, file, and line parameters, and fix CamelCase names:

pChannel => ch
chanId => id
pChan => hdr

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:02 -04:00 committed by Greg Kroah-Hartman
parent 9f16930e55
commit 0859891848
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/unisys/common-spar/include/channels/channel.h
View File

@ -149,10 +149,6 @@ ULTRA_CHANNELCLI_STRING(u32 v)
mb(); /* required for channel synch */ \
} while (0)
#define ULTRA_CHANNEL_CLIENT_RELEASE_OS(pChan, chanId, logCtx) \
ULTRA_channel_client_release_os(pChan, chanId, logCtx, \
(char *)__FILE__, __LINE__, (char *)__func__)
/* Values for ULTRA_CHANNEL_PROTOCOL.CliErrorBoot: */
/* throttling invalid boot channel statetransition error due to client
* disabled */
@ -494,29 +490,25 @@ spar_channel_client_acquire_os(void __iomem *ch, u8 *id)
}
static inline void
ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
void *logCtx, char *file, int line, char *func)
spar_channel_client_release_os(void __iomem *ch, u8 *id)
{
struct channel_header __iomem *pChan = pChannel;
struct channel_header __iomem *hdr = ch;
if (readb(&pChan->cli_error_os) != 0) {
if (readb(&hdr->cli_error_os) != 0) {
/* we are in an error msg throttling state; come out of it */
pr_info("%s Channel OS client error state cleared @%s:%d\n",
chanId, pathname_last_n_nodes((u8 *) file, 4),
line);
writeb(0, &pChan->cli_error_os);
pr_info("%s Channel OS client error state cleared\n", id);
writeb(0, &hdr->cli_error_os);
}
if (readl(&pChan->cli_state_os) == CHANNELCLI_OWNED)
if (readl(&hdr->cli_state_os) == CHANNELCLI_OWNED)
return;
if (readl(&pChan->cli_state_os) != CHANNELCLI_BUSY) {
pr_info("%s Channel StateTransition INVALID! - release failed because OS client NOT BUSY (state=%s(%d)) @%s:%d\n",
chanId, ULTRA_CHANNELCLI_STRING(
readl(&pChan->cli_state_os)),
readl(&pChan->cli_state_os),
pathname_last_n_nodes((u8 *) file, 4), line);
if (readl(&hdr->cli_state_os) != CHANNELCLI_BUSY) {
pr_info("%s Channel StateTransition INVALID! - release failed because OS client NOT BUSY (state=%s(%d))\n",
id, ULTRA_CHANNELCLI_STRING(
readl(&hdr->cli_state_os)),
readl(&hdr->cli_state_os));
/* return; */
}
writel(CHANNELCLI_ATTACHED, &pChan->cli_state_os); /* release busy */
writel(CHANNELCLI_ATTACHED, &hdr->cli_state_os); /* release busy */
}
/*

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

@ -87,7 +87,7 @@ do_locked_client_insert(struct uisqueue_info *queueinfo,
queueinfo->packets_sent++;
rc = 1;
}
ULTRA_CHANNEL_CLIENT_RELEASE_OS(queueinfo->chan, channelId, NULL);
spar_channel_client_release_os(queueinfo->chan, channelId);
unlock:
spin_unlock_irqrestore((spinlock_t *)lock, flags);
return rc;

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

@ -1285,8 +1285,7 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc,
}
qrslt = uisqueue_get_cmdrsp(dc->queueinfo, cmdrsp,
IOCHAN_FROM_IOPART);
ULTRA_CHANNEL_CLIENT_RELEASE_OS(dc->queueinfo->chan,
"vhba", NULL);
spar_channel_client_release_os(dc->queueinfo->chan, "vhba");
spin_unlock_irqrestore(&virthbainfo->chinfo.insertlock, flags);
if (qrslt == 0)
break;