Skip to content

Commit

Permalink
Staging: hv: Cleanup blkvsc_remove()
Browse files Browse the repository at this point in the history
blkvsc_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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent c425065 commit a31de96
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,22 +556,12 @@ static int blkvsc_remove(struct device *device)
struct hv_device *device_obj = device_to_hv_device(device);
struct block_device_context *blkdev = dev_get_drvdata(device);
unsigned long flags;
int ret;


if (!storvsc_drv_obj->base.dev_rm)
return -1;

/*
* Call to the vsc driver to let it know that the device is being
* removed
*/
ret = storvsc_drv_obj->base.dev_rm(device_obj);
if (ret != 0) {
/* TODO: */
DPRINT_ERR(BLKVSC_DRV,
"unable to remove blkvsc device (ret %d)", ret);
}
storvsc_drv_obj->base.dev_rm(device_obj);

/* Get to a known state */
spin_lock_irqsave(&blkdev->lock, flags);
Expand Down Expand Up @@ -604,7 +594,8 @@ static int blkvsc_remove(struct device *device)

kfree(blkdev);

return ret;
return 0;

}

static void blkvsc_shutdown(struct device *device)
Expand Down

0 comments on commit a31de96

Please sign in to comment.