lkml.org 
[lkml]   [2011]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] devfreq: separate error paths from successful path
    From
    Date
    I think this change improves readability.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/devfreq/devfreq.c | 15 +++++++--------
    1 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
    index 59d24e9..c189b82 100644
    --- a/drivers/devfreq/devfreq.c
    +++ b/drivers/devfreq/devfreq.c
    @@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
    if (!IS_ERR(devfreq)) {
    dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
    err = -EINVAL;
    - goto out;
    + goto err_out;
    }
    }

    @@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
    dev_err(dev, "%s: Unable to create devfreq for the device\n",
    __func__);
    err = -ENOMEM;
    - goto out;
    + goto err_out;
    }

    mutex_init(&devfreq->lock);
    @@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
    devfreq->next_polling);
    }
    mutex_unlock(&devfreq_list_lock);
    - goto out;
    +out:
    + return devfreq;
    +
    err_init:
    device_unregister(&devfreq->dev);
    err_dev:
    mutex_unlock(&devfreq->lock);
    kfree(devfreq);
    -out:
    - if (err)
    - return ERR_PTR(err);
    - else
    - return devfreq;
    +err_out:
    + return ERR_PTR(err);
    }

    /**
    --
    1.7.5.4




    \
     
     \ /
      Last update: 2011-11-10 08:33    [W:0.033 / U:14.496 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site