iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: unisys: refactor init_vbus_channel()

Browse Source 
Clean up the function definition so it's a single line. Remove the unnecessary
goto statements and just return directly. Remove the unneeded local variable
for the return result. Fix CamelCase parameters and local variable names:

channelAddr => ch_addr
channelBytes => ch_bytes
pChan => ch

Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
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-12-05 17:08:52 -05:00
committed by Greg Kroah-Hartman
parent b98ab24cdf
commit eb4a146802
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/unisys/uislib/uislib.c
View File

@ -128,28 +128,22 @@ init_msg_header(struct controlvm_message *msg, u32 id, uint rsp, uint svr)
msg->hdr.flags.server = svr; msg->hdr.flags.server = svr;
} }
static __iomem void * static __iomem void *init_vbus_channel(u64 ch_addr, u32 ch_bytes)
init_vbus_channel(u64 channelAddr, u32 channelBytes)
{ {
void __iomem *rc = NULL; void __iomem *ch = uislib_ioremap_cache(ch_addr, ch_bytes);
void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes);
if (!pChan) { if (!ch) {
LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed", LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed",
(unsigned long long)channelAddr, (unsigned long long)ch_addr,
(unsigned long long)channelBytes); (unsigned long long)ch_bytes);
rc = NULL; return NULL;
goto Away;
} }
if (!SPAR_VBUS_CHANNEL_OK_CLIENT(pChan)) { if (!SPAR_VBUS_CHANNEL_OK_CLIENT(ch)) {
ERRDRV("%s channel cannot be used", __func__); ERRDRV("%s channel cannot be used", __func__);
uislib_iounmap(pChan); uislib_iounmap(ch);
rc = NULL; return NULL;
goto Away;
} }
rc = pChan; return ch;
Away:
return rc;
} }
static int static int