lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 49/86] watchdog: hpwdt: fix unused variable warning
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

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

    \
     
     \ /
      Last update: 2018-03-16 17:58    [W:3.690 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site