leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: Cleanup storvsc_remove()

Browse Source 
storvsc_remove() cannot fail, clean it up accordingly.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-04-22 14:55:18 -07:00 committed by Greg Kroah-Hartman
parent a31de969bf
commit 1c8d0b7dec
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/hv/storvsc_drv.c
View File

@ -404,7 +404,6 @@ static int storvsc_probe(struct device *device)
*/ */
static int storvsc_remove(struct device *device) static int storvsc_remove(struct device *device)
{ {
int ret;
struct hv_driver *drv = struct hv_driver *drv =
drv_to_hv_drv(device->driver); drv_to_hv_drv(device->driver);
struct storvsc_driver_object *storvsc_drv_obj = drv->priv; struct storvsc_driver_object *storvsc_drv_obj = drv->priv;
@ -413,20 +412,11 @@ static int storvsc_remove(struct device *device)
struct host_device_context *host_device_ctx = struct host_device_context *host_device_ctx =
(struct host_device_context *)host->hostdata; (struct host_device_context *)host->hostdata;
if (!storvsc_drv_obj->base.dev_rm)
return -1;
/* /*
* Call to the vsc driver to let it know that the device is being * Call to the vsc driver to let it know that the device is being
* removed * removed
*/ */
ret = storvsc_drv_obj->base.dev_rm(device_obj); storvsc_drv_obj->base.dev_rm(device_obj);
if (ret != 0) {
/* TODO: */
DPRINT_ERR(STORVSC, "unable to remove vsc device (ret %d)",
ret);
}
if (host_device_ctx->request_pool) { if (host_device_ctx->request_pool) {
kmem_cache_destroy(host_device_ctx->request_pool); kmem_cache_destroy(host_device_ctx->request_pool);
@ -438,7 +428,7 @@ static int storvsc_remove(struct device *device)
DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host); DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
scsi_host_put(host); scsi_host_put(host);
return ret; return 0;
} }
/* /*