From a31de969bf3f33456975f16d14519c1ff3803ae8 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 22 Apr 2011 14:55:17 -0700 Subject: [PATCH] Staging: hv: Cleanup blkvsc_remove() blkvsc_remove() cannot fail. Clean it up accordingly. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/blkvsc_drv.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 58d4a2db0a62..7974e6c0f88a 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -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); @@ -604,7 +594,8 @@ static int blkvsc_remove(struct device *device) kfree(blkdev); - return ret; + return 0; + } static void blkvsc_shutdown(struct device *device) -- 2.20.1