target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch

   1 From d9c8bc8c1408f3e8529db6e4e04017b4c579c342 Mon Sep 17 00:00:00 2001
   2 From: Pawel Dembicki <paweldembicki@gmail.com>
   3 Date: Sun, 18 Feb 2018 17:08:04 +0100
   4 Subject: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio
   5
   6 In devices, where fdt is used, is impossible to apply platform data
   7 without proper fdt node.
   8
   9 This patch allow to use platform data in devices with fdt.
  10
  11 Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
  12 ---
  13  drivers/w1/masters/w1-gpio.c | 7 +++----
  14  1 file changed, 3 insertions(+), 4 deletions(-)
  15
  16 diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
  17 index a90728ceec5a..7b80762941af 100644
  18 --- a/drivers/w1/masters/w1-gpio.c
  19 +++ b/drivers/w1/masters/w1-gpio.c
  20 @@ -112,17 +112,16 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
  21  static int w1_gpio_probe(struct platform_device *pdev)
  22  {
  23         struct w1_bus_master *master;
  24 -       struct w1_gpio_platform_data *pdata;
  25 +       struct w1_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
  26         int err;
  27
  28 -       if (of_have_populated_dt()) {
  29 +       if (of_have_populated_dt() && !pdata) {
  30                 err = w1_gpio_probe_dt(pdev);
  31                 if (err < 0)
  32                         return err;
  33 +               pdata = dev_get_platdata(&pdev->dev);
  34         }
  35
  36 -       pdata = dev_get_platdata(&pdev->dev);
  37 -
  38         if (!pdata) {
  39                 dev_err(&pdev->dev, "No configuration data\n");
  40                 return -ENXIO;
  41 --
  42 2.14.1
  43