From 5af5175deabd00a2b803e1f82aac3dd62d79ce61 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sat, 27 Aug 2011 11:31:00 -0700
Subject: [PATCH] --- yaml --- r: 268031 b: refs/heads/master c:
 0fb07a87ec663652bea02a54faa05fb4b3d0c20f h: refs/heads/master i:   268029:
 a2416f2fcf314f6db790793dcf8bd9deb7e6fa21   268027:
 29eb27d4adcb1ad5389853f2024083dba63168dc   268023:
 aab25e62dd6c80557bc98064ce2ffa665ab1337c   268015:
 600ade8a83bdb4aebe5023476e931e49eb219f8f   267999:
 54631a12c0f792ea74edd37e795d92579f1588fd   267967:
 c186f90e9fb752d90d035da655b18da4c4ce2138   267903:
 d4f8b00b7bd63cbb0deef7e595ef23c79bbea4d1   267775:
 715bb8c95dd332b0086b6553022882bc7ceecde3 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/hv/storvsc.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 16865922602e..87b583e8c9e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a504de3a1e201994eff1400d4eb16241be68c311
+refs/heads/master: 0fb07a87ec663652bea02a54faa05fb4b3d0c20f
diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index 827b6a307eff..8c62829f5993 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/drivers/staging/hv/storvsc.c
@@ -51,10 +51,6 @@ static inline struct storvsc_device *alloc_stor_device(struct hv_device *device)
 	return stor_device;
 }
 
-static inline void free_stor_device(struct storvsc_device *device)
-{
-	kfree(device);
-}
 
 /* Get the stordevice object iff exists and its refcount > 0 */
 static inline struct storvsc_device *must_get_stor_device(
@@ -394,7 +390,7 @@ int storvsc_dev_add(struct hv_device *device,
 	/* Send it back up */
 	ret = storvsc_connect_to_vsp(device, device_info->ring_buffer_size);
 	if (ret) {
-		free_stor_device(stor_device);
+		kfree(stor_device);
 		return ret;
 	}
 	device_info->path_id = stor_device->path_id;
@@ -422,7 +418,7 @@ int storvsc_dev_remove(struct hv_device *device)
 	/* Close the channel */
 	vmbus_close(device->channel);
 
-	free_stor_device(stor_device);
+	kfree(stor_device);
 	return 0;
 }