lkml.org 
[lkml]   [2012]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] regulator: virtual: Convert to use devm_* APIs
    From
    Date
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/virtual.c | 18 +++++-------------
    1 files changed, 5 insertions(+), 13 deletions(-)

    diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
    index ee0b161..f74a68f 100644
    --- a/drivers/regulator/virtual.c
    +++ b/drivers/regulator/virtual.c
    @@ -291,18 +291,19 @@ static int __devinit regulator_virtual_probe(struct platform_device *pdev)
    struct virtual_consumer_data *drvdata;
    int ret;

    - drvdata = kzalloc(sizeof(struct virtual_consumer_data), GFP_KERNEL);
    + drvdata = devm_kzalloc(&pdev->dev, sizeof(struct virtual_consumer_data),
    + GFP_KERNEL);
    if (drvdata == NULL)
    return -ENOMEM;

    mutex_init(&drvdata->lock);

    - drvdata->regulator = regulator_get(&pdev->dev, reg_id);
    + drvdata->regulator = devm_regulator_get(&pdev->dev, reg_id);
    if (IS_ERR(drvdata->regulator)) {
    ret = PTR_ERR(drvdata->regulator);
    dev_err(&pdev->dev, "Failed to obtain supply '%s': %d\n",
    reg_id, ret);
    - goto err;
    + return ret;
    }

    ret = sysfs_create_group(&pdev->dev.kobj,
    @@ -310,7 +311,7 @@ static int __devinit regulator_virtual_probe(struct platform_device *pdev)
    if (ret != 0) {
    dev_err(&pdev->dev,
    "Failed to create attribute group: %d\n", ret);
    - goto err_regulator;
    + return ret;
    }

    drvdata->mode = regulator_get_mode(drvdata->regulator);
    @@ -318,12 +319,6 @@ static int __devinit regulator_virtual_probe(struct platform_device *pdev)
    platform_set_drvdata(pdev, drvdata);

    return 0;
    -
    -err_regulator:
    - regulator_put(drvdata->regulator);
    -err:
    - kfree(drvdata);
    - return ret;
    }

    static int __devexit regulator_virtual_remove(struct platform_device *pdev)
    @@ -334,9 +329,6 @@ static int __devexit regulator_virtual_remove(struct platform_device *pdev)

    if (drvdata->enabled)
    regulator_disable(drvdata->regulator);
    - regulator_put(drvdata->regulator);
    -
    - kfree(drvdata);

    platform_set_drvdata(pdev, NULL);

    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-04-18 22:37    [W:0.036 / U:1.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site