The patch titled xtensa: s/irq_chip/irq_data/ in various places has been added to the -mm tree. Its filename is xtensa-s-irq_chip-irq_data-in-various-places.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: xtensa: s/irq_chip/irq_data/ in various places From: Wanlong Gao <wanlong.gao@xxxxxxxxx> The functions of xtensa_irq_chip members use the wrong argument. Signed-off-by: Wanlong Gao <wanlong.gao@xxxxxxxxx> Cc: Christian Zankel <chris@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/xtensa/kernel/irq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN arch/xtensa/kernel/irq.c~xtensa-s-irq_chip-irq_data-in-various-places arch/xtensa/kernel/irq.c --- a/arch/xtensa/kernel/irq.c~xtensa-s-irq_chip-irq_data-in-various-places +++ a/arch/xtensa/kernel/irq.c @@ -75,36 +75,36 @@ int arch_show_interrupts(struct seq_file 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; _ Patches currently in -mm which might be from wanlong.gao@xxxxxxxxx are xtensa-s-irq_chip-irq_data-in-various-places.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html