Staging: hv: storvsc: Inline free_stor_device()
authorK. Y. Srinivasan <kys@microsoft.com>
Sat, 27 Aug 2011 18:31:00 +0000 (11:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 18:01:01 +0000 (11:01 -0700)
Inline the code for  free_stor_device() and get rid of the function.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc.c

index 827b6a307eff52fff67c725be6d2cac89b0d6e3b..8c62829f599362a6349064a6971daf18762cf084 100644 (file)
@@ -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;
 }