Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[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 9709b8b484bacc8fcd9ddb4c1a88e137e2afa961..b99a932ad901ff5b81e458349e0100be564fd37f 100644 (file)
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -89,11 +89,22 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
                pdata->is_open_drain = 1;
 
        gpio = of_get_gpio(np, 0);
-       if (gpio < 0)
+       if (gpio < 0) {
+               if (gpio != -EPROBE_DEFER)
+                       dev_err(&pdev->dev,
+                                       "Failed to parse gpio property for data pin (%d)\n",
+                                       gpio);
+
                return gpio;
+       }
        pdata->pin = gpio;
 
-       pdata->ext_pullup_enable_pin = of_get_gpio(np, 1);
+       gpio = of_get_gpio(np, 1);
+       if (gpio == -EPROBE_DEFER)
+               return gpio;
+       /* ignore other errors as the pullup gpio is optional */
+       pdata->ext_pullup_enable_pin = gpio;
+
        pdev->dev.platform_data = pdata;
 
        return 0;
@@ -107,10 +118,8 @@ static int w1_gpio_probe(struct platform_device *pdev)
 
        if (of_have_populated_dt()) {
                err = w1_gpio_probe_dt(pdev);
-               if (err < 0) {
-                       dev_err(&pdev->dev, "Failed to parse DT\n");
+               if (err < 0)
                        return err;
-               }
        }
 
        pdata = dev_get_platdata(&pdev->dev);
@@ -219,7 +228,6 @@ static int w1_gpio_resume(struct platform_device *pdev)
 static struct platform_driver w1_gpio_driver = {
        .driver = {
                .name   = "w1-gpio",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(w1_gpio_dt_ids),
        },
        .probe = w1_gpio_probe,