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>

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 34c86628422c80a5d4e4866f33365632da61f37e..e6337418767a9775763682cf1e893936d3f91958 100644 (file)
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -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);

diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c
index 2c4f4c8e5e72c25bed7f83a05956b019b2774da1..7ef1f2ba19d227bfeb6aff80a1e34c8a9bc10e38 100644 (file)
--- a/drivers/staging/hv/ChannelMgmt.c
+++ b/drivers/staging/hv/ChannelMgmt.c
@@ -762,7 +762,7 @@ VmbusChannelRequestOffers(
 Cleanup:
        if (msgInfo)
        {
-               WaitEventClose(msgInfo->WaitEvent);
+               kfree(msgInfo->WaitEvent);
                kfree(msgInfo);
        }
 

diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
index 33e5628b88c3ce83b9c0f6a54f55907cc1474309..8d76bd45db8751e55d3489857fd3d583edcf042e 100644 (file)
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -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);
        }

diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index 9445e36423b99e2ad2c11234d68f25bea0456f73..dea54098e5107a78bc454ec261e147a8f19c230d 100644 (file)
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -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);

diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index c6b9dfd2f2e469355805dd6ea29edf41595bba29..5b992dfdb0f65610c1c113b8364d33769f0f7791 100644 (file)
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -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);
 }
 

diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 1c82e7923ff09b5ecf5d869247aba7f3302d8bfa..ef8031fd3850ea2760332dddcaecb562875d751f 100644 (file)
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -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");
 
        /*

diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 4147aba5d3147d7ba80e48c0d0993773fef5979e..e1f37879f52d27d450eb441f12effeead8179b7a 100644 (file)
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -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);
 

diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 46cdf88cf9d596ca0dd585302ead18121e77e4cf..8ca56a4fce2bddf796be0be79adb7aedd79a3b98 100644 (file)
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -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;