Skip to content

Commit

Permalink
Staging: hv: storvsc: Inline free_stor_device()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 29, 2011
1 parent a504de3 commit 0fb07a8
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 0fb07a8

Please sign in to comment.