w1-gpio: Use devm_* functions

[firefly-linux-kernel-4.4.55.git] / drivers / w1 / masters / w1-gpio.c

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index f54ece268c982d1dce13224c78efce9434dbffbb..264ad1c583abcc78ad04a8190edfffcfc4aacde5 100644 (file)
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -58,6 +58,7 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
 {
        struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
        struct device_node *np = pdev->dev.of_node;
+       int gpio;
 
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
@@ -66,7 +67,11 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
        if (of_get_property(np, "linux,open-drain", NULL))
                pdata->is_open_drain = 1;
 
-       pdata->pin = of_get_gpio(np, 0);
+       gpio = of_get_gpio(np, 0);
+       if (gpio < 0)
+               return gpio;
+       pdata->pin = gpio;
+
        pdata->ext_pullup_enable_pin = of_get_gpio(np, 1);
        pdev->dev.platform_data = pdata;
 
@@ -94,25 +99,27 @@ static int w1_gpio_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL);
+       master = devm_kzalloc(&pdev->dev, sizeof(struct w1_bus_master),
+                       GFP_KERNEL);
        if (!master) {
                dev_err(&pdev->dev, "Out of memory\n");
                return -ENOMEM;
        }
 
-       err = gpio_request(pdata->pin, "w1");
+       err = devm_gpio_request(&pdev->dev, pdata->pin, "w1");
        if (err) {
                dev_err(&pdev->dev, "gpio_request (pin) failed\n");
-               goto free_master;
+               return err;
        }
 
        if (gpio_is_valid(pdata->ext_pullup_enable_pin)) {
-               err = gpio_request_one(pdata->ext_pullup_enable_pin,
-                                      GPIOF_INIT_LOW, "w1 pullup");
+               err = devm_gpio_request_one(&pdev->dev,
+                               pdata->ext_pullup_enable_pin, GPIOF_INIT_LOW,
+                               "w1 pullup");
                if (err < 0) {
                        dev_err(&pdev->dev, "gpio_request_one "
                                        "(ext_pullup_enable_pin) failed\n");
-                       goto free_gpio;
+                       return err;
                }
        }
 
@@ -130,7 +137,7 @@ static int w1_gpio_probe(struct platform_device *pdev)
        err = w1_add_master_device(master);
        if (err) {
                dev_err(&pdev->dev, "w1_add_master device failed\n");
-               goto free_gpio_ext_pu;
+               return err;
        }
 
        if (pdata->enable_external_pullup)
@@ -142,16 +149,6 @@ static int w1_gpio_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, master);
 
        return 0;
-
- free_gpio_ext_pu:
-       if (gpio_is_valid(pdata->ext_pullup_enable_pin))
-               gpio_free(pdata->ext_pullup_enable_pin);
- free_gpio:
-       gpio_free(pdata->pin);
- free_master:
-       kfree(master);
-
-       return err;
 }
 
 static int w1_gpio_remove(struct platform_device *pdev)
@@ -166,8 +163,6 @@ static int w1_gpio_remove(struct platform_device *pdev)
                gpio_set_value(pdata->ext_pullup_enable_pin, 0);
 
        w1_remove_master_device(master);
-       gpio_free(pdata->pin);
-       kfree(master);
 
        return 0;
 }