Commit 591567a5 authored by Shawn Guo's avatar Shawn Guo Committed by Grant Likely
Browse files

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.

  659fb32d
  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: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 752ad5e8

drivers/gpio/gpio-mxc.c

+2 −2
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port) 
	gc->private = port;



	ct = gc->chip_types;

	ct->chip.irq_ack = irq_gc_ack,

	ct->chip.irq_ack = irq_gc_ack_set_bit;

	ct->chip.irq_mask = irq_gc_mask_clr_bit;

	ct->chip.irq_unmask = irq_gc_mask_set_bit;

	ct->chip.irq_set_type = gpio_set_irq_type;

	ct->chip.irq_set_wake = gpio_set_wake_irq,

	ct->chip.irq_set_wake = gpio_set_wake_irq;

	ct->regs.ack = GPIO_ISR;

	ct->regs.mask = GPIO_IMR;

drivers/gpio/gpio-mxs.c

+2 −2
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ static void __init mxs_gpio_init_gc(struct mxs_gpio_port *port) 
	gc->private = port;



	ct = gc->chip_types;

	ct->chip.irq_ack = irq_gc_ack,

	ct->chip.irq_ack = irq_gc_ack_set_bit;

	ct->chip.irq_mask = irq_gc_mask_clr_bit;

	ct->chip.irq_unmask = irq_gc_mask_set_bit;

	ct->chip.irq_set_type = mxs_gpio_set_irq_type;

	ct->chip.irq_set_wake = mxs_gpio_set_wake_irq,

	ct->chip.irq_set_wake = mxs_gpio_set_wake_irq;

	ct->regs.ack = PINCTRL_IRQSTAT(port->id) + MXS_CLR;

	ct->regs.mask = PINCTRL_IRQEN(port->id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE