watchdog: hpwdt: fix unused variable warning
PATCH 1/1 watchdog: hpwdt: fix unused variable warning
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.
--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/hpwdt.c +1 -1
@@ -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 */
Signature · 1 line
2.9.0
Quoted 35 lines · Arnd Bergmann
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 <[email protected]>--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/hpwdt.c +1
-1@@ -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 */ Signature · 1 line
2.9.0
Looks fine. Thanks!
Signature · 3 lines
----------------------------------------------------------------------------- Jerry Hoemann Software Engineer Hewlett Packard Enterprise -----------------------------------------------------------------------------
Quoted 10 lines · Arnd Bergmann
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 <[email protected]>
Quoted 23 lines
--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/hpwdt.c +1
-1@@ -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 */