| From aeebc6ba88ba3758ad95467ff6191fabf2074c13 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Wed, 6 Dec 2017 22:02:37 +0100 |
| Subject: watchdog: hpwdt: fix unused variable warning |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit aeebc6ba88ba3758ad95467ff6191fabf2074c13 upstream. |
| |
| The new hpwdt_my_nmi() function is used conditionally, which produces |
| a harmless warning in some configurations: |
| |
| drivers/watchdog/hpwdt.c:478:12: error: 'hpwdt_my_nmi' defined but not used [-Werror=unused-function] |
| |
| This moves it inside of the #ifdef that protects its caller, to silence |
| the warning. |
| |
| Fixes: 621174a92851 ("watchdog: hpwdt: Check source of NMI") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/watchdog/hpwdt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/watchdog/hpwdt.c |
| +++ b/drivers/watchdog/hpwdt.c |
| @@ -475,12 +475,12 @@ static int hpwdt_time_left(void) |
| return TICKS_TO_SECS(ioread16(hpwdt_timer_reg)); |
| } |
| |
| +#ifdef CONFIG_HPWDT_NMI_DECODING |
| static int hpwdt_my_nmi(void) |
| { |
| return ioread8(hpwdt_nmistat) & 0x6; |
| } |
| |
| -#ifdef CONFIG_HPWDT_NMI_DECODING |
| /* |
| * NMI Handler |
| */ |
