Staging: hv: remove WaitEventClose()

All WaitEventClose() close did was call kfree(), so get rid of it and
replace it with a call to kfree()

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-07-29 17:00:10 -04:00 committed by Greg Kroah-Hartman
parent de65a38406
commit 420beac4fc
8 changed files with 11 additions and 17 deletions

View file

@ -309,7 +309,7 @@ Cleanup:
REMOVE_ENTRY_LIST(&openInfo->MsgListEntry);
spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
WaitEventClose(openInfo->WaitEvent);
kfree(openInfo->WaitEvent);
kfree(openInfo);
DPRINT_EXIT(VMBUS);
@ -596,7 +596,7 @@ Cleanup:
REMOVE_ENTRY_LIST(&msgInfo->MsgListEntry);
spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
WaitEventClose(msgInfo->WaitEvent);
kfree(msgInfo->WaitEvent);
kfree(msgInfo);
DPRINT_EXIT(VMBUS);
@ -658,7 +658,7 @@ VmbusChannelTeardownGpadl(
REMOVE_ENTRY_LIST(&info->MsgListEntry);
spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
WaitEventClose(info->WaitEvent);
kfree(info->WaitEvent);
kfree(info);
DPRINT_EXIT(VMBUS);

View file

@ -762,7 +762,7 @@ VmbusChannelRequestOffers(
Cleanup:
if (msgInfo)
{
WaitEventClose(msgInfo->WaitEvent);
kfree(msgInfo->WaitEvent);
kfree(msgInfo);
}

View file

@ -155,7 +155,7 @@ VmbusConnect(void)
}
WaitEventClose(msgInfo->WaitEvent);
kfree(msgInfo->WaitEvent);
kfree(msgInfo);
DPRINT_EXIT(VMBUS);
@ -183,7 +183,7 @@ Cleanup:
if (msgInfo)
{
if (msgInfo->WaitEvent)
WaitEventClose(msgInfo->WaitEvent);
kfree(msgInfo->WaitEvent);
kfree(msgInfo);
}

View file

@ -880,7 +880,7 @@ Cleanup:
if (netDevice)
{
WaitEventClose(netDevice->ChannelInitEvent);
kfree(netDevice->ChannelInitEvent);
while (!IsListEmpty(&netDevice->ReceivePacketList))
{
@ -963,7 +963,7 @@ NetVscOnDeviceRemove(
kfree(netvscPacket);
}
WaitEventClose(netDevice->ChannelInitEvent);
kfree(netDevice->ChannelInitEvent);
FreeNetDevice(netDevice);
DPRINT_EXIT(NETVSC);

View file

@ -273,7 +273,7 @@ static inline void PutRndisRequest(RNDIS_DEVICE *Device, RNDIS_REQUEST *Request)
REMOVE_ENTRY_LIST(&Request->ListEntry);
spin_unlock_irqrestore(&Device->request_lock, flags);
WaitEventClose(Request->WaitEvent);
kfree(Request->WaitEvent);
kfree(Request);
}

View file

@ -516,7 +516,7 @@ static int StorVscChannelInit(struct hv_device *Device)
Cleanup:
if (request->WaitEvent)
{
WaitEventClose(request->WaitEvent);
kfree(request->WaitEvent);
request->WaitEvent = NULL;
}
@ -678,7 +678,7 @@ StorVscOnHostReset(
/* FIXME: Add a timeout */
WaitEventWait(request->WaitEvent);
WaitEventClose(request->WaitEvent);
kfree(request->WaitEvent);
DPRINT_INFO(STORVSC, "host adapter reset completed");
/*

View file

@ -134,7 +134,6 @@ extern int TimerStop(struct osd_timer *t);
extern void TimerStart(struct osd_timer *t, u32 expirationInUs);
extern struct osd_waitevent *WaitEventCreate(void);
extern void WaitEventClose(struct osd_waitevent *waitEvent);
extern void WaitEventSet(struct osd_waitevent *waitEvent);
extern int WaitEventWait(struct osd_waitevent *waitEvent);

View file

@ -216,11 +216,6 @@ struct osd_waitevent *WaitEventCreate(void)
return wait;
}
void WaitEventClose(struct osd_waitevent *waitEvent)
{
kfree(waitEvent);
}
void WaitEventSet(struct osd_waitevent *waitEvent)
{
waitEvent->condition = 1;