2011-04-10 06:15:47

by Wanlong Gao

Subject: [PATCH 1/3] fix the argument error of irq_chip's members

From: Wanlong Gao <[email protected]>

The functions of xtensa_irq_chip members use the wrong argument.

Signed-off-by: Wanlong Gao <[email protected]>
---
arch/xtensa/kernel/irq.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index d77089d..e47c2a9
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -75,36 +75,36 @@ int arch_show_interrupts(struct seq_file *p, int prec)
return 0;
}

-static void xtensa_irq_mask(struct irq_chip *d)
+static void xtensa_irq_mask(struct irq_data *d)
{
cached_irq_mask &= ~(1 << d->irq);
set_sr (cached_irq_mask, INTENABLE);
}

-static void xtensa_irq_unmask(struct irq_chip *d)
+static void xtensa_irq_unmask(struct irq_data *d)
{
cached_irq_mask |= 1 << d->irq;
set_sr (cached_irq_mask, INTENABLE);
}

-static void xtensa_irq_enable(struct irq_chip *d)
+static void xtensa_irq_enable(struct irq_data *d)
{
variant_irq_enable(d->irq);
xtensa_irq_unmask(d->irq);
}

-static void xtensa_irq_disable(struct irq_chip *d)
+static void xtensa_irq_disable(struct irq_data *d)
{
xtensa_irq_mask(d->irq);
variant_irq_disable(d->irq);
}

-static void xtensa_irq_ack(struct irq_chip *d)
+static void xtensa_irq_ack(struct irq_data *d)
{
set_sr(1 << d->irq, INTCLEAR);
}

-static int xtensa_irq_retrigger(struct irq_chip *d)
+static int xtensa_irq_retrigger(struct irq_data *d)
{
set_sr (1 << d->irq, INTSET);
return 1;
--
1.7.3

2011-04-10 06:16:04

by Wanlong Gao

Subject: [PATCH 2/3] fix the wrong argument of the functions definition

From: Wanlong Gao <[email protected]>

The functions of eic_chip's memebers use the wrong argument .

Signed-off-by: Wanlong Gao <[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
--- 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.3

2011-04-10 06:16:16

by Wanlong Gao

Subject: [PATCH 3/3] fix the wrong members of gru_chip

From: Wanlong Gao <[email protected]>

Fix the wrong members and the wrong function's definition,
since the irq_chip had changed .

Signed-off-by: Wanlong Gao <[email protected]>
---
drivers/misc/sgi-gru/grufile.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 20e4e93..ecafa4b
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -348,15 +348,15 @@ static unsigned long gru_chiplet_cpu_to_mmr(int chiplet, int cpu, int *corep)

static int gru_irq_count[GRU_CHIPLETS_PER_BLADE];

-static void gru_noop(unsigned int irq)
+static void gru_noop(struct irq_data *d)
{
}

static struct irq_chip gru_chip[GRU_CHIPLETS_PER_BLADE] = {
[0 ... GRU_CHIPLETS_PER_BLADE - 1] {
- .mask = gru_noop,
- .unmask = gru_noop,
- .ack = gru_noop
+ .irq_mask = gru_noop,
+ .irq_unmask = gru_noop,
+ .irq_ack = gru_noop
}
};

--
1.7.3

2011-04-13 13:15:04

by Hans-Christian Egtvedt

Subject: Re: [PATCH 2/3] fix the wrong argument of the functions definition

On Sun, 2011-04-10 at 14:14 +0800, [email protected] wrote:
> From: Wanlong Gao <[email protected]>
>
> The functions of eic_chip's memebers use the wrong argument .
>
> Signed-off-by: Wanlong Gao <[email protected]>

Thanks for this fix, added to the AVR32 tree.

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

<snipp patch>

--
Hans-Christian Egtvedt

2011-04-13 13:18:43

by Wanlong Gao

Subject: Re: [PATCH 2/3] fix the wrong argument of the functions definition

于 2011-4-13 21:14, Hans-Christian Egtvedt 写道:
> On Sun, 2011-04-10 at 14:14 +0800, [email protected] wrote:
>> From: Wanlong Gao<[email protected]>
>>
>> The functions of eic_chip's memebers use the wrong argument .
>>
>> Signed-off-by: Wanlong Gao<[email protected]>
>
> Thanks for this fix, added to the AVR32 tree.
>
Thanks for your hard work to the open-source .
> Signed-off-by: Hans-Christian Egtvedt<[email protected]>
>
> <snipp patch>
>