lkml.org 
[lkml]   [2017]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 36/42] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit f0e8faa7a5e894b0fc99d24be1b18685a92ea466 upstream.

    This function clearly never worked and always returns true,
    as pointed out by gcc-7:

    arch/arm/mach-ux500/pm.c: In function 'prcmu_is_cpu_in_wfi':
    arch/arm/mach-ux500/pm.c:137:212: error: ?:
    using integer constants in boolean context, the expression
    will always evaluate to 'true' [-Werror=int-in-bool-context]

    With the added braces, the condition actually makes sense.

    Fixes: 34fe6f107eab ("mfd : Check if the other db8500 core is in WFI")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-ux500/pm.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/arm/mach-ux500/pm.c
    +++ b/arch/arm/mach-ux500/pm.c
    @@ -134,8 +134,8 @@ bool prcmu_pending_irq(void)
    */
    bool prcmu_is_cpu_in_wfi(int cpu)
    {
    - return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 :
    - PRCM_ARM_WFI_STANDBY_WFI0;
    + return readl(PRCM_ARM_WFI_STANDBY) &
    + (cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0);
    }

    /*

    \
     
     \ /
      Last update: 2017-01-24 09:34    [W:3.212 / U:1.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site