Re: [PATCH 1/5] drivers/gpio/gpio-omap.c: convert comma to semicolon

[Kevin Hilman <khilman@linaro.org>]

Joe Perches <joe@perches.com> writes:

> On Sat, 2013-08-10 at 17:40 +0200, Julia Lawall wrote:
>> From: Julia Lawall <Julia.Lawall@lip6.fr>
>> Replace a comma between expression statements by a semicolon.
> []
>> I can't tell if the assignment to ct->regs.mask is really intended to be
>> under the if.  The proposed patch preserves the current semantics, but not
>> the current indentation.
>
> I'd suspect more that the indentation is correct
> and the comma use incorrect.
>
> It also looks more like a copy/paste error from
> commit f8b46b583 when the code was restructured
> a bit.
>
> Kevin?

Yes, looks like a copy/paste error.  The comma should simply be replaced
by a semi-colon.

Kevin


> --------------------
>
> -#ifdef CONFIG_ARCH_OMAP16XX
> -       /* REVISIT: assuming only 16xx supports MPUIO wake events */
> -       .irq_set_wake   = gpio_wake_enable,
> -#endif
> -};
>
> --------------------
>
> +       /* REVISIT: assuming only 16xx supports MPUIO wake events */
> +       if (cpu_is_omap16xx())
> +               ct->chip.irq_set_wake = gpio_wake_enable,
>
> --------------------
>
>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
> []
>> @@ -1029,10 +1029,10 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
>>  	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
>>  	ct->chip.irq_set_type = gpio_irq_type;
>>  
>> -	if (bank->regs->wkup_en)
>> -		ct->chip.irq_set_wake = gpio_wake_enable,
>> -
>> -	ct->regs.mask = OMAP_MPUIO_GPIO_INT / bank->stride;
>> +	if (bank->regs->wkup_en) {
>> +		ct->chip.irq_set_wake = gpio_wake_enable;
>> +		ct->regs.mask = OMAP_MPUIO_GPIO_INT / bank->stride;
>> +	}
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/