lkml.org 
[lkml]   [2011]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/21] Staging: hv: Cleanup blkvsc_remove()
    Date
    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>
    ---
    drivers/staging/hv/blkvsc_drv.c | 15 +++------------
    1 files changed, 3 insertions(+), 12 deletions(-)

    diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
    index 58d4a2d..7974e6c 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)
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-04-22 23:45    [W:5.299 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site