These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / power / reset / ltc2952-poweroff.c

diff --git a/kernel/drivers/power/reset/ltc2952-poweroff.c b/kernel/drivers/power/reset/ltc2952-poweroff.c
index 1e08195..15fed9d 100644 (file)
--- a/kernel/drivers/power/reset/ltc2952-poweroff.c
+++ b/kernel/drivers/power/reset/ltc2952-poweroff.c
@@ -158,7 +158,6 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
                              HRTIMER_MODE_REL);
        } else {
                hrtimer_cancel(&data->timer_trigger);
-               /* omitting return value check, timer should have been valid */
        }
        return IRQ_HANDLED;
 }
@@ -202,16 +201,15 @@ static int ltc2952_poweroff_init(struct platform_device *pdev)
                return ret;
        }
 
-       data->gpio_trigger = devm_gpiod_get(&pdev->dev, "trigger", GPIOD_IN);
+       data->gpio_trigger = devm_gpiod_get_optional(&pdev->dev, "trigger",
+                                                    GPIOD_IN);
        if (IS_ERR(data->gpio_trigger)) {
                /*
                 * It's not a problem if the trigger gpio isn't available, but
                 * it is worth a warning if its use was defined in the device
                 * tree.
                 */
-               if (PTR_ERR(data->gpio_trigger) != -ENOENT)
-                       dev_err(&pdev->dev,
-                               "unable to claim gpio \"trigger\"\n");
+               dev_err(&pdev->dev, "unable to claim gpio \"trigger\"\n");
                data->gpio_trigger = NULL;
        }