From b7801a2e6bf4013ab9eefa5ed11e94246cdf86bb Mon Sep 17 00:00:00 2001 From: Ken Cox Date: Thu, 3 Jul 2014 10:02:17 -0500 Subject: [PATCH] Staging: unisys: Remove ultra_vbus_init_channel function The function ultra_vbus_init_channel() is never called since previous server code was removed. Remove the dead code. Signed-off-by: Ken Cox Signed-off-by: Greg Kroah-Hartman --- .../common-spar/include/channels/vbuschannel.h | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h index 000182c..69de9d9 100644 --- a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h @@ -94,42 +94,6 @@ typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL { sizeof(ULTRA_VBUS_DEVICEINFO))) #define VBUS_CH_SIZE(MAXDEVICES) COVER(VBUS_CH_SIZE_EXACT(MAXDEVICES), 4096) -static inline void -ultra_vbus_init_channel(ULTRA_VBUS_CHANNEL_PROTOCOL __iomem *x, - int bytesAllocated) -{ - /* Please note that the memory at does NOT necessarily have space - * for DevInfo structs allocated at the end, which is why we do NOT use - * to clear. */ - memset_io(x, 0, sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL)); - if (bytesAllocated < (int) sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL)) - return; - writel(ULTRA_VBUS_CHANNEL_PROTOCOL_VERSIONID, - &x->ChannelHeader.VersionId); - writeq(ULTRA_VBUS_CHANNEL_PROTOCOL_SIGNATURE, - &x->ChannelHeader.Signature); - writel(CHANNELSRV_READY, &x->ChannelHeader.SrvState); - writel(sizeof(x->ChannelHeader), &x->ChannelHeader.HeaderSize); - writeq(bytesAllocated, &x->ChannelHeader.Size); - memcpy_toio(&x->ChannelHeader.Type, &UltraVbusChannelProtocolGuid, - sizeof(x->ChannelHeader.Type)); - memcpy_toio(&x->ChannelHeader.ZoneGuid, &NULL_UUID_LE, sizeof(uuid_le)); - writel(sizeof(ULTRA_VBUS_HEADERINFO), &x->HdrInfo.structBytes); - writel(sizeof(ULTRA_VBUS_HEADERINFO), &x->HdrInfo.chpInfoByteOffset); - writel(readl(&x->HdrInfo.chpInfoByteOffset) + - sizeof(ULTRA_VBUS_DEVICEINFO), - &x->HdrInfo.busInfoByteOffset); - writel(readl(&x->HdrInfo.busInfoByteOffset) - + sizeof(ULTRA_VBUS_DEVICEINFO), - &x->HdrInfo.devInfoByteOffset); - writel(sizeof(ULTRA_VBUS_DEVICEINFO), - &x->HdrInfo.deviceInfoStructBytes); - bytesAllocated -= (sizeof(ULTRA_CHANNEL_PROTOCOL) - + readl(&x->HdrInfo.devInfoByteOffset)); - writel(bytesAllocated / readl(&x->HdrInfo.deviceInfoStructBytes), - &x->HdrInfo.devInfoCount); -} - #pragma pack(pop) #endif -- 2.7.4