]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
regulator: gpio-regulator: Basic devm_kzalloc() conversion
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 Apr 2012 22:20:56 +0000 (23:20 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 4 Apr 2012 10:38:52 +0000 (11:38 +0100)
There's some other allocations but they're not so trivial as they use
kmemdup() and kstrdup().

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/gpio-regulator.c

index 5f9b6add5d1da0f590ffb3f8449ce1ca1983075d..ad0fc78c3cb4520a6b11d98a367e1fb1ab9b01db 100644 (file)
@@ -174,7 +174,8 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
        struct gpio_regulator_data *drvdata;
        int ptr, ret, state;
 
-       drvdata = kzalloc(sizeof(struct gpio_regulator_data), GFP_KERNEL);
+       drvdata = devm_kzalloc(&pdev->dev, sizeof(struct gpio_regulator_data),
+                              GFP_KERNEL);
        if (drvdata == NULL) {
                dev_err(&pdev->dev, "Failed to allocate device data\n");
                return -ENOMEM;
@@ -307,7 +308,6 @@ err_memgpio:
 err_name:
        kfree(drvdata->desc.name);
 err:
-       kfree(drvdata);
        return ret;
 }
 
@@ -326,7 +326,6 @@ static int __devexit gpio_regulator_remove(struct platform_device *pdev)
                gpio_free(drvdata->enable_gpio);
 
        kfree(drvdata->desc.name);
-       kfree(drvdata);
 
        return 0;
 }