Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 591567a5ea25852f20b7ef2953f6f72020121199

Authored by Shawn Guo
Committed by Grant Likely
1 parent 752ad5e82d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming 

The following commit renames irq_gc_ack() to irq_gc_ack_set_bit(),
and makes gpio-mxc and gpio-mxs fail to build.

  659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
  genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)

The patch fixed a couple of typo of comma to semicolon.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/gpio/gpio-mxc.c
Diff comments   View file @ 591567a
... ... @@ -297,11 +297,11 @@
297 297 gc->private = port;
298 298  
299 299 ct = gc->chip_types;
300   - ct->chip.irq_ack = irq_gc_ack,
  300 + ct->chip.irq_ack = irq_gc_ack_set_bit;
301 301 ct->chip.irq_mask = irq_gc_mask_clr_bit;
302 302 ct->chip.irq_unmask = irq_gc_mask_set_bit;
303 303 ct->chip.irq_set_type = gpio_set_irq_type;
304   - ct->chip.irq_set_wake = gpio_set_wake_irq,
  304 + ct->chip.irq_set_wake = gpio_set_wake_irq;
305 305 ct->regs.ack = GPIO_ISR;
306 306 ct->regs.mask = GPIO_IMR;
307 307  
drivers/gpio/gpio-mxs.c
Diff comments   View file @ 591567a
... ... @@ -156,11 +156,11 @@
156 156 gc->private = port;
157 157  
158 158 ct = gc->chip_types;
159   - ct->chip.irq_ack = irq_gc_ack,
  159 + ct->chip.irq_ack = irq_gc_ack_set_bit;
160 160 ct->chip.irq_mask = irq_gc_mask_clr_bit;
161 161 ct->chip.irq_unmask = irq_gc_mask_set_bit;
162 162 ct->chip.irq_set_type = mxs_gpio_set_irq_type;
163   - ct->chip.irq_set_wake = mxs_gpio_set_wake_irq,
  163 + ct->chip.irq_set_wake = mxs_gpio_set_wake_irq;
164 164 ct->regs.ack = PINCTRL_IRQSTAT(port->id) + MXS_CLR;
165 165 ct->regs.mask = PINCTRL_IRQEN(port->id);
166 166