[PATCH 075/117] Staging: hv: storvsc: Inline free_stor_device()
K. Y. Srinivasan
kys at microsoft.com
Fri Jul 15 17:47:03 UTC 2011
Inline the code for free_stor_device() and get rid of the function.
Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz at microsoft.com>
---
drivers/staging/hv/storvsc.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 827b6a3..8c62829 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/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;
}
--
1.7.4.1
More information about the devel
mailing list