diff options
Diffstat (limited to 'drivers/watchdog/imx_sc_wdt.c')
| -rw-r--r-- | drivers/watchdog/imx_sc_wdt.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c index 27b84ab5d6f0..5408fa3db68f 100644 --- a/drivers/watchdog/imx_sc_wdt.c +++ b/drivers/watchdog/imx_sc_wdt.c @@ -34,9 +34,6 @@ #define SC_TIMER_WDOG_ACTION_PARTITION 0 -#define SC_IRQ_WDOG 1 -#define SC_IRQ_GROUP_WDOG 1 - static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0000); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" @@ -134,8 +131,8 @@ static int imx_sc_wdt_notify(struct notifier_block *nb, struct imx_sc_wdt_device, wdt_notifier); - if (event & SC_IRQ_WDOG && - *(u8 *)group == SC_IRQ_GROUP_WDOG) + if (event & IMX_SC_IRQ_WDOG && + *(u8 *)group == IMX_SC_IRQ_GROUP_WDOG) watchdog_notify_pretimeout(&imx_sc_wdd->wdd); return 0; @@ -146,8 +143,8 @@ static void imx_sc_wdt_action(void *data) struct notifier_block *wdt_notifier = data; imx_scu_irq_unregister_notifier(wdt_notifier); - imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, - SC_IRQ_WDOG, + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_WDOG, + IMX_SC_IRQ_WDOG, false); } @@ -196,9 +193,9 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) watchdog_stop_on_reboot(wdog); watchdog_stop_on_unregister(wdog); - ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, - SC_IRQ_WDOG, - true); + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_WDOG, + IMX_SC_IRQ_WDOG, + true); if (ret) { dev_warn(dev, "Enable irq failed, pretimeout NOT supported\n"); goto register_device; @@ -207,8 +204,8 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) imx_sc_wdd->wdt_notifier.notifier_call = imx_sc_wdt_notify; ret = imx_scu_irq_register_notifier(&imx_sc_wdd->wdt_notifier); if (ret) { - imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, - SC_IRQ_WDOG, + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_WDOG, + IMX_SC_IRQ_WDOG, false); dev_warn(dev, "Register irq notifier failed, pretimeout NOT supported\n"); |