| Message ID | 1376149225-3997-2-git-send-email-Julia.Lawall@lip6.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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? -------------------- -#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-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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/ -- 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
On Mon, Aug 12, 2013 at 6:15 PM, Kevin Hilman <khilman@linaro.org> wrote: > 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. So can I have a patch for this? Pretty please... Yours, Linus Walleij -- 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 --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index dfeb3a3..db80880 100644 --- 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; + } irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST | IRQ_NOPROBE, 0); }