Subject: [PATCH 1/2] avr32: At32ap: fix extint irq_chip type from irq_chip to irq_data

introduce in commit 7776e233ef

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc: Hans-Christian Egtvedt <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Cc: Patrice Vilchez <[email protected]>
---
arch/avr32/mach-at32ap/extint.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index 47ba4b9..755ac59 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -61,34 +61,34 @@ struct eic {
static struct eic *nmi_eic;
static bool nmi_enabled;

-static void eic_ack_irq(struct irq_chip *d)
+static void eic_ack_irq(struct irq_data *d)
{
- struct eic *eic = irq_data_get_irq_chip_data(data);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
}

-static void eic_mask_irq(struct irq_chip *d)
+static void eic_mask_irq(struct irq_data *d)
{
- struct eic *eic = irq_data_get_irq_chip_data(data);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}

-static void eic_mask_ack_irq(struct irq_chip *d)
+static void eic_mask_ack_irq(struct irq_data *d)
{
- struct eic *eic = irq_data_get_irq_chip_data(data);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}

-static void eic_unmask_irq(struct irq_chip *d)
+static void eic_unmask_irq(struct irq_data *d)
{
- struct eic *eic = irq_data_get_irq_chip_data(data);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, IER, 1 << (d->irq - eic->first_irq));
}

-static int eic_set_irq_type(struct irq_chip *d, unsigned int flow_type)
+static int eic_set_irq_type(struct irq_data *d, unsigned int flow_type)
{
- struct eic *eic = irq_data_get_irq_chip_data(data);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
unsigned int irq = d->irq;
unsigned int i = irq - eic->first_irq;
u32 mode, edge, level;
--
1.7.4.1


Subject: [PATCH 2/2] avr32: At32ap: pio fix typo "))" on gpio_irq_unmask prototype

introduce in commit d75f1bfdbccb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Hans-Christian Egtvedt <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Cc: Patrice Vilchez <[email protected]>
---
arch/avr32/mach-at32ap/pio.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index f308e1d..2e0aa85 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -257,7 +257,7 @@ static void gpio_irq_mask(struct irq_data *d)
pio_writel(pio, IDR, 1 << (gpio & 0x1f));
}

-static void gpio_irq_unmask(struct irq_data *d))
+static void gpio_irq_unmask(struct irq_data *d)
{
unsigned gpio = irq_to_gpio(d->irq);
struct pio_device *pio = &pio_dev[gpio >> 5];
--
1.7.4.1

2011-04-13 14:20:07

by Hans-Christian Egtvedt

[permalink] [raw]
Subject: Re: [PATCH 2/2] avr32: At32ap: pio fix typo "))" on gpio_irq_unmask prototype

On Sun, 2011-04-10 at 06:17 +0200, Jean-Christophe PLAGNIOL-VILLARD
wrote:
> introduce in commit d75f1bfdbccb
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Hans-Christian Egtvedt <[email protected]>
> Cc: Nicolas Ferre <[email protected]>
> Cc: Patrice Vilchez <[email protected]>

Thanks, I'll pull this into the AVR32 tree.

Signed-off-by: Hans-Christian Egtvedt <[email protected]>

<snipp patch>

--
Hans-Christian Egtvedt

2011-04-13 14:20:11

by Hans-Christian Egtvedt

[permalink] [raw]
Subject: Re: [PATCH 1/2] avr32: At32ap: fix extint irq_chip type from irq_chip to irq_data

On Sun, 2011-04-10 at 06:17 +0200, Jean-Christophe PLAGNIOL-VILLARD
wrote:
> introduce in commit 7776e233ef
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
> Cc: Hans-Christian Egtvedt <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Nicolas Ferre <[email protected]>
> Cc: Patrice Vilchez <[email protected]>

Thanks, but seems like Andrew already pulled a similar fix [1] into the
-mm tree which I'll send through the AVR32 tree.

<snipp patch>

1: http://www.spinics.net/lists/mm-commits/msg83268.html

--
Hans-Christian Egtvedt