Commit 548950a2 authored by Ken Cox's avatar Ken Cox Committed by Greg Kroah-Hartman

Staging: unisys: Remove isServer arg from init_vbus_channel()

The init_vbus_channel() function is never called with the isServer
argument equal to TRUE, so just get rid of the argument altogether.
This also means that the code in the function that would be executed
in the server case can be removed since it is never executed.
Signed-off-by: default avatarKen Cox <jkc@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 960e0a5f
...@@ -129,7 +129,7 @@ init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr) ...@@ -129,7 +129,7 @@ init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr)
} }
static __iomem void * static __iomem void *
init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer) init_vbus_channel(U64 channelAddr, U32 channelBytes)
{ {
void __iomem *rc = NULL; void __iomem *rc = NULL;
void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes); void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes);
...@@ -140,23 +140,12 @@ init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer) ...@@ -140,23 +140,12 @@ init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer)
rc = NULL; rc = NULL;
goto Away; goto Away;
} }
if (isServer) {
memset_io(pChan, 0, channelBytes);
if (!ULTRA_VBUS_CHANNEL_OK_SERVER(channelBytes, NULL)) {
ERRDRV("%s channel cannot be used", __func__);
uislib_iounmap(pChan);
rc = NULL;
goto Away;
}
ultra_vbus_init_channel(pChan, channelBytes);
} else {
if (!ULTRA_VBUS_CHANNEL_OK_CLIENT(pChan, NULL)) { if (!ULTRA_VBUS_CHANNEL_OK_CLIENT(pChan, NULL)) {
ERRDRV("%s channel cannot be used", __func__); ERRDRV("%s channel cannot be used", __func__);
uislib_iounmap(pChan); uislib_iounmap(pChan);
rc = NULL; rc = NULL;
goto Away; goto Away;
} }
}
rc = pChan; rc = pChan;
Away: Away:
return rc; return rc;
...@@ -235,8 +224,7 @@ create_bus(CONTROLVM_MESSAGE *msg, char *buf) ...@@ -235,8 +224,7 @@ create_bus(CONTROLVM_MESSAGE *msg, char *buf)
bus->busChannelBytes = msg->cmd.createBus.channelBytes; bus->busChannelBytes = msg->cmd.createBus.channelBytes;
bus->pBusChannel = bus->pBusChannel =
init_vbus_channel(msg->cmd.createBus.channelAddr, init_vbus_channel(msg->cmd.createBus.channelAddr,
msg->cmd.createBus.channelBytes, msg->cmd.createBus.channelBytes);
msg->hdr.Flags.server);
} }
/* the msg is bound for virtpci; send guest_msgs struct to callback */ /* the msg is bound for virtpci; send guest_msgs struct to callback */
if (!msg->hdr.Flags.server) { if (!msg->hdr.Flags.server) {
......
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