diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 08:45:31 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 08:45:31 -0400 |
| commit | bcae888039d5f0b522e1588c54f95a7612d1723c (patch) | |
| tree | d8039698a3b74223dc94798046049e9bfcf23fe7 /drivers/gpio/gpio-mxc.c | |
| parent | 3685bbce2ea6142e81c78e6f3d5b2a1cdc37660e (diff) | |
| parent | bdac2b6dc7392668a8530d67a5f762366f57f9b4 (diff) | |
Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel
Diffstat (limited to 'drivers/gpio/gpio-mxc.c')
| -rw-r--r-- | drivers/gpio/gpio-mxc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index ec1eb1b7250f..0f740276ed2b 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c | |||
| @@ -275,8 +275,8 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat) | |||
| 275 | static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 275 | static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) |
| 276 | { | 276 | { |
| 277 | u32 irq_stat; | 277 | u32 irq_stat; |
| 278 | struct mxc_gpio_port *port = irq_get_handler_data(irq); | 278 | struct mxc_gpio_port *port = irq_desc_get_handler_data(desc); |
| 279 | struct irq_chip *chip = irq_get_chip(irq); | 279 | struct irq_chip *chip = irq_desc_get_chip(desc); |
| 280 | 280 | ||
| 281 | chained_irq_enter(chip, desc); | 281 | chained_irq_enter(chip, desc); |
| 282 | 282 | ||
| @@ -292,7 +292,7 @@ static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc) | |||
| 292 | { | 292 | { |
| 293 | u32 irq_msk, irq_stat; | 293 | u32 irq_msk, irq_stat; |
| 294 | struct mxc_gpio_port *port; | 294 | struct mxc_gpio_port *port; |
| 295 | struct irq_chip *chip = irq_get_chip(irq); | 295 | struct irq_chip *chip = irq_desc_get_chip(desc); |
| 296 | 296 | ||
| 297 | chained_irq_enter(chip, desc); | 297 | chained_irq_enter(chip, desc); |
| 298 | 298 | ||