From cc9cc794c329a9c4d0c1056b4b1f1632e9db0b8c Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 19 Feb 2020 16:20:47 -0800 Subject: watchdog: qcom: Use irq flags from firmware The DT or ACPI tables should tell the driver what the irq flags are. Given that this driver probes only on DT based platforms and those DT platforms specify the irq flags we can safely drop the forced irq flag setting here. Cc: Andy Gross Cc: Bjorn Andersson Cc: Sai Prakash Ranjan Signed-off-by: Stephen Boyd Reviewed-by: Bjorn Andersson Reviewed-by: Guenter Roeck Reviewed-by: Sai Prakash Ranjan Link: https://lore.kernel.org/r/20200220002047.115000-1-swboyd@chromium.org [groeck: Context conflict resolution] Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/qcom-wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index 460967a02da3..ab7465d186fd 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -263,8 +263,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) /* check if there is pretimeout support */ irq = platform_get_irq_optional(pdev, 0); if (data->pretimeout && irq > 0) { - ret = devm_request_irq(dev, irq, qcom_wdt_isr, - IRQF_TRIGGER_RISING, + ret = devm_request_irq(dev, irq, qcom_wdt_isr, 0, "wdt_bark", &wdt->wdd); if (ret) return ret; -- cgit v1.2.3