Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio
To:     Pawel Dembicki <paweldembicki@gmail.com>
CC:     <stable@vger.kernel.org>, Evgeniy Polyakov <zbr@ioremap.net>,
        Sebastian Reichel <sre@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        <linux-kernel@vger.kernel.org>
References: <20180218170629.6045-1-paweldembicki@gmail.com>
 <20180218171927.6414-1-paweldembicki@gmail.com>
From:   "Andrew F. Davis" <afd@ti.com>
Message-ID: <4e34938c-7dc7-07bc-9074-a726bd06d744@ti.com>
Date:   Mon, 19 Feb 2018 07:29:53 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <20180218171927.6414-1-paweldembicki@gmail.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 02/18/2018 11:19 AM, Pawel Dembicki wrote:
> In devices, where fdt is used, is impossible to apply platform data
> without proper fdt node.
> 
> This patch allow to use platform data in devices with fdt.
> 
> Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
> ---

Good catch,

Acked-by: Andrew F. Davis <afd@ti.com>

>  drivers/w1/masters/w1-gpio.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
> index a90728ceec5a..7b80762941af 100644
> --- a/drivers/w1/masters/w1-gpio.c
> +++ b/drivers/w1/masters/w1-gpio.c
> @@ -112,17 +112,16 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
>  static int w1_gpio_probe(struct platform_device *pdev)
>  {
>  	struct w1_bus_master *master;
> -	struct w1_gpio_platform_data *pdata;
> +	struct w1_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
>  	int err;
>  
> -	if (of_have_populated_dt()) {
> +	if (of_have_populated_dt() && !pdata) {
>  		err = w1_gpio_probe_dt(pdev);
>  		if (err < 0)
>  			return err;
> +		pdata = dev_get_platdata(&pdev->dev);
>  	}
>  
> -	pdata = dev_get_platdata(&pdev->dev);
> -
>  	if (!pdata) {
>  		dev_err(&pdev->dev, "No configuration data\n");
>  		return -ENXIO;
>