diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-03-02 18:31:13 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2017-06-05 17:58:30 +0200 |
| commit | 39bd56df7b2dae80d4099c64ad776775a3876ed5 (patch) | |
| tree | 922899cff53bd3534325f40f4305e8a6da22bfab /drivers/watchdog | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| download | linux-stable-39bd56df7b2dae80d4099c64ad776775a3876ed5.tar.gz linux-stable-39bd56df7b2dae80d4099c64ad776775a3876ed5.tar.bz2 linux-stable-39bd56df7b2dae80d4099c64ad776775a3876ed5.zip | |
watchodg: sama5d4: simplify probe
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/sama5d4_wdt.c | 14 |
1 files 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, |