diff mbox

arm: omap2: vc: fix 'or' always true warning

Message ID 1440756632-14043-1-git-send-email-frans.klaver@xsens.com (mailing list archive)
State New, archived
Headers show

Commit Message

Frans Klaver Aug. 28, 2015, 10:10 a.m. UTC 
From: Frans Klaver <fransklaver@gmail.com>

Fix the warning:
arch/arm/mach-omap2/vc.c:302:47: warning: logical ‘or’ of collectively exhaustive tests is always true [-Wlogical-op]

As we're toggling both CLKREQ and OFFMODE, we should also be checking
OFFMODE.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 arch/arm/mach-omap2/vc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren Sept. 1, 2015, 3:46 p.m. UTC | #1 
* Frans Klaver <frans.klaver@xsens.com> [150828 03:14]:
> From: Frans Klaver <fransklaver@gmail.com>
> 
> Fix the warning:
> arch/arm/mach-omap2/vc.c:302:47: warning: logical ‘or’ of collectively exhaustive tests is always true [-Wlogical-op]
> 
> As we're toggling both CLKREQ and OFFMODE, we should also be checking
> OFFMODE.
> 
> Signed-off-by: Frans Klaver <fransklaver@gmail.com>

Thanks apppying into omap-for-v4.3/fixes.

Tony

> ---
>  arch/arm/mach-omap2/vc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
> index 076fd20d7e5a..807bc79e3e3d 100644
> --- a/arch/arm/mach-omap2/vc.c
> +++ b/arch/arm/mach-omap2/vc.c
> @@ -300,7 +300,7 @@ static void __init omap3_vc_init_pmic_signaling(struct voltagedomain *voltdm)
>  
>  	val = voltdm->read(OMAP3_PRM_POLCTRL_OFFSET);
>  	if (!(val & OMAP3430_PRM_POLCTRL_CLKREQ_POL) ||
> -	    (val & OMAP3430_PRM_POLCTRL_CLKREQ_POL)) {
> +	    (val & OMAP3430_PRM_POLCTRL_OFFMODE_POL)) {
>  		val |= OMAP3430_PRM_POLCTRL_CLKREQ_POL;
>  		val &= ~OMAP3430_PRM_POLCTRL_OFFMODE_POL;
>  		pr_debug("PM: fixing sys_clkreq and sys_off_mode polarity to 0x%x\n",
> -- 
> 2.3.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Frans Klaver Sept. 1, 2015, 6:21 p.m. UTC | #2 
On Tue, Sep 1, 2015 at 5:46 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Frans Klaver <frans.klaver@xsens.com> [150828 03:14]:
>> From: Frans Klaver <fransklaver@gmail.com>
>>
>> Fix the warning:
>> arch/arm/mach-omap2/vc.c:302:47: warning: logical ‘or’ of collectively exhaustive tests is always true [-Wlogical-op]
>>
>> As we're toggling both CLKREQ and OFFMODE, we should also be checking
>> OFFMODE.
>>
>> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
>
> Thanks apppying into omap-for-v4.3/fixes.

Thanks!

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

Patch

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 076fd20d7e5a..807bc79e3e3d 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -300,7 +300,7 @@  static void __init omap3_vc_init_pmic_signaling(struct voltagedomain *voltdm)
 
 	val = voltdm->read(OMAP3_PRM_POLCTRL_OFFSET);
 	if (!(val & OMAP3430_PRM_POLCTRL_CLKREQ_POL) ||
-	    (val & OMAP3430_PRM_POLCTRL_CLKREQ_POL)) {
+	    (val & OMAP3430_PRM_POLCTRL_OFFMODE_POL)) {
 		val |= OMAP3430_PRM_POLCTRL_CLKREQ_POL;
 		val &= ~OMAP3430_PRM_POLCTRL_OFFMODE_POL;
 		pr_debug("PM: fixing sys_clkreq and sys_off_mode polarity to 0x%x\n",