lkml.org 
[lkml]   [2010]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] staging: slicoss: error handling with goto
    Date
    This patch makes error handling more readable due to 'goto err' pattern.

    Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
    ---
    drivers/staging/slicoss/slicoss.c | 15 +++++++--------
    1 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
    index 86bc733..d8c952e 100644
    --- a/drivers/staging/slicoss/slicoss.c
    +++ b/drivers/staging/slicoss/slicoss.c
    @@ -2646,22 +2646,21 @@ static int slic_upr_request(struct adapter *adapter,
    u32 upr_data_h,
    u32 upr_buffer, u32 upr_buffer_h)
    {
    - int status;
    + int rc;

    spin_lock_irqsave(&adapter->upr_lock.lock, adapter->upr_lock.flags);
    - status = slic_upr_queue_request(adapter,
    + rc = slic_upr_queue_request(adapter,
    upr_request,
    upr_data,
    upr_data_h, upr_buffer, upr_buffer_h);
    - if (status != 0) {
    - spin_unlock_irqrestore(&adapter->upr_lock.lock,
    - adapter->upr_lock.flags);
    - return status;
    - }
    + if (rc)
    + goto err_unlock_irq;
    +
    slic_upr_start(adapter);
    +err_unlock_irq:
    spin_unlock_irqrestore(&adapter->upr_lock.lock,
    adapter->upr_lock.flags);
    - return 0;
    + return rc;
    }

    static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-06-27 15:25    [W:0.021 / U:0.136 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site