Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752304AbdCDPGb (ORCPT ); Sat, 4 Mar 2017 10:06:31 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:46251 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752224AbdCDPG3 (ORCPT ); Sat, 4 Mar 2017 10:06:29 -0500 Subject: Re: [PATCH 3/4] watchodg: sama5d4: simplify probe To: Alexandre Belloni References: <20170302173114.28508-1-alexandre.belloni@free-electrons.com> <20170302173114.28508-4-alexandre.belloni@free-electrons.com> Cc: Wim Van Sebroeck , Nicolas Ferre , Wenyou.Yang@microchip.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org From: Guenter Roeck Message-ID: <126269ed-7b78-2885-7120-e57e2e40c14b@roeck-us.net> Date: Sat, 4 Mar 2017 07:06:26 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170302173114.28508-4-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1334 Lines: 39 On 03/02/2017 09:31 AM, Alexandre Belloni wrote: > Because the only way to use the driver is to have a device tree enabling > it, pdev->dev.of_node will never be NULL. Remove the unnecessary check. > > Signed-off-by: Alexandre Belloni Reviewed-by: Guenter Roeck > --- > drivers/watchdog/sama5d4_wdt.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c > index 362fd229786d..d710014f3b7d 100644 > --- a/drivers/watchdog/sama5d4_wdt.c > +++ b/drivers/watchdog/sama5d4_wdt.c > @@ -228,15 +228,13 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) > > wdt->reg_base = regs; > > - if (pdev->dev.of_node) { > - irq = irq_of_parse_and_map(pdev->dev.of_node, 0); > - if (!irq) > - dev_warn(&pdev->dev, "failed to get IRQ from DT\n"); > + irq = irq_of_parse_and_map(pdev->dev.of_node, 0); > + if (!irq) > + dev_warn(&pdev->dev, "failed to get IRQ from DT\n"); > > - ret = of_sama5d4_wdt_init(pdev->dev.of_node, wdt); > - if (ret) > - return ret; > - } > + ret = of_sama5d4_wdt_init(pdev->dev.of_node, wdt); > + if (ret) > + return ret; > > if ((wdt->mr & AT91_WDT_WDFIEN) && irq) { > ret = devm_request_irq(&pdev->dev, irq, sama5d4_wdt_irq_handler, >