]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchodg: sama5d4: simplify probe
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 2 Mar 2017 17:31:13 +0000 (18:31 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 5 Jun 2017 15:58:30 +0000 (17:58 +0200)
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 <alexandre.belloni@free-electrons.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/sama5d4_wdt.c

index 362fd229786df6cea1600108a9060b89b800f475..d710014f3b7d5b6f5cefa72037415d5725fd66e9 100644 (file)
@@ -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,