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 18/21] Staging: hv: Fix a jump label (Cleanup) in blkvsc_drv
    Date
    One of the goto labels was named Cleanup; change it to cleanup.

    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 | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
    index bf8647e..a47581c 100644
    --- a/drivers/staging/hv/blkvsc_drv.c
    +++ b/drivers/staging/hv/blkvsc_drv.c
    @@ -963,7 +963,7 @@ static int blkvsc_probe(struct device *device)
    blkdev = kzalloc(sizeof(struct block_device_context), GFP_KERNEL);
    if (!blkdev) {
    ret = -ENOMEM;
    - goto Cleanup;
    + goto cleanup;
    }

    INIT_LIST_HEAD(&blkdev->pending_list);
    @@ -977,14 +977,14 @@ static int blkvsc_probe(struct device *device)
    SLAB_HWCACHE_ALIGN, NULL);
    if (!blkdev->request_pool) {
    ret = -ENOMEM;
    - goto Cleanup;
    + goto cleanup;
    }


    /* Call to the vsc driver to add the device */
    ret = storvsc_drv_obj->base.dev_add(device_obj, &device_info);
    if (ret != 0)
    - goto Cleanup;
    + goto cleanup;

    blkdev->device_ctx = device_obj;
    /* this identified the device 0 or 1 */
    @@ -1027,7 +1027,7 @@ static int blkvsc_probe(struct device *device)
    }
    } else {
    ret = -1;
    - goto Cleanup;
    + goto cleanup;
    }

    DPRINT_INFO(BLKVSC_DRV, "blkvsc registered for major %d!!", major);
    @@ -1035,7 +1035,7 @@ static int blkvsc_probe(struct device *device)
    blkdev->gd = alloc_disk(BLKVSC_MINORS);
    if (!blkdev->gd) {
    ret = -1;
    - goto Cleanup;
    + goto cleanup;
    }

    blkdev->gd->queue = blk_init_queue(blkvsc_request, &blkdev->lock);
    @@ -1074,7 +1074,7 @@ static int blkvsc_probe(struct device *device)
    Remove:
    storvsc_drv_obj->base.dev_rm(device_obj);

    -Cleanup:
    +cleanup:
    if (blkdev) {
    if (blkdev->request_pool) {
    kmem_cache_destroy(blkdev->request_pool);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-04-22 23:47    [W:0.034 / U:32.352 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site