Re: [PATCH] mach-pxa: sharpsl_pm: simplify conditional

[Eric Miao]

On Sat, Oct 30, 2010 at 5:31 AM, Nicolas Kaiser <nikai@xxxxxxxxx> wrote:
> Simplify: ((a && b) || !a) => (b || !a)
>

This is a good catch, I believe this could be generally applied elsewhere
in the kernel. The problem with sharpsl_pm is that it's currently a mess
and needs a fully rewrite, I'd really like this issue being addressed in that
rewritten version.

> Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
> ---
> Âarch/arm/mach-pxa/sharpsl_pm.c | Â Â2 +-
> Â1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 8fed027..d08763c 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -619,7 +619,7 @@ static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable
> Â Â Â ÂPEDR = 0xffffffff; /* clear it */
>
> Â Â Â Âsharpsl_pm.flags &= ~SHARPSL_ALARM_ACTIVE;
> - Â Â Â if ((sharpsl_pm.charge_mode == CHRG_ON) && ((alarm_enable && ((alarm_time - RCNR) > (SHARPSL_BATCHK_TIME_SUSPEND + 30))) || !alarm_enable)) {
> + Â Â Â if ((sharpsl_pm.charge_mode == CHRG_ON) && (((alarm_time - RCNR) > (SHARPSL_BATCHK_TIME_SUSPEND + 30)) || !alarm_enable)) {
> Â Â Â Â Â Â Â ÂRTSR &= RTSR_ALE;
> Â Â Â Â Â Â Â ÂRTAR = RCNR + SHARPSL_BATCHK_TIME_SUSPEND;
> Â Â Â Â Â Â Â Âdev_dbg(sharpsl_pm.dev, "Charging alarm at: %08x\n", RTAR);
> --
> 1.7.2.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/