lkml.org 
[lkml]   [2011]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 44/49] Staging: hv: vmbus: Cleanup error handling in vmbus_bus_init()
    Date
    Cleanup error handling in vmbus_bus_init().

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
    ---
    drivers/staging/hv/vmbus_drv.c | 16 ++++++----------
    1 files changed, 6 insertions(+), 10 deletions(-)
    diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
    index a3c99f1..be158be 100644
    --- a/drivers/staging/hv/vmbus_drv.c
    +++ b/drivers/staging/hv/vmbus_drv.c
    @@ -535,7 +535,7 @@ static int vmbus_bus_init(int irq)
    ret = hv_init();
    if (ret != 0) {
    pr_err("Unable to initialize the hypervisor - 0x%x\n", ret);
    - goto cleanup;
    + return ret;
    }

    /* Initialize the bus context */
    @@ -544,10 +544,8 @@ static int vmbus_bus_init(int irq)

    /* Now, register the bus with LDM */
    ret = bus_register(&hv_bus);
    - if (ret) {
    - ret = -1;
    - goto cleanup;
    - }
    + if (ret)
    + return ret;

    /* Get the interrupt resource */
    ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
    @@ -559,8 +557,7 @@ static int vmbus_bus_init(int irq)

    bus_unregister(&hv_bus);

    - ret = -1;
    - goto cleanup;
    + return ret;
    }

    vector = IRQ0_VECTOR + irq;
    @@ -574,14 +571,13 @@ static int vmbus_bus_init(int irq)
    if (ret) {
    free_irq(irq, hv_acpi_dev);
    bus_unregister(&hv_bus);
    - goto cleanup;
    + return ret;
    }


    vmbus_request_offers();

    -cleanup:
    - return ret;
    + return 0;
    }

    /**
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-06-07 00:41    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean