watchdog: hpwdt: fix unused variable warning

Message ID 20171206210250.1222757-1-arnd@arndb.de
State New
Headers show
Series
  • watchdog: hpwdt: fix unused variable warning
Related show

Commit Message

Arnd Bergmann Dec. 6, 2017, 9:02 p.m.
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>

---
 drivers/watchdog/hpwdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jerry Hoemann Dec. 6, 2017, 10:53 p.m. | #1
On Wed, Dec 06, 2017 at 10:02:37PM +0100, Arnd Bergmann wrote:
> 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>

> ---

>  drivers/watchdog/hpwdt.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c

> index e61658310381..f1f00dfc0e68 100644

> --- 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

>   */

> -- 

> 2.9.0

> 



Looks fine. Thanks!


Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>



-- 

-----------------------------------------------------------------------------
Jerry Hoemann                  Software Engineer   Hewlett Packard Enterprise
-----------------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Guenter Roeck Dec. 7, 2017, 4:36 a.m. | #2
On 12/06/2017 01:02 PM, Arnd Bergmann wrote:
> 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: Guenter Roeck <linux@roeck-us.net>


> ---

>   drivers/watchdog/hpwdt.c | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c

> index e61658310381..f1f00dfc0e68 100644

> --- 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

>    */

> 


--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index e61658310381..f1f00dfc0e68 100644
--- 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
  */