frv: Convert to new irq_chip functions
cover frv: Convert to new irq_chip functions
This series converts frv to the new irq_chip functions.
I compiled only the affected files, as the whole thing does not build.
Thanks,
tglx
PATCH 1/7 frv: Remove stale irq_chip.end
irq_chip.end got obsolete with the removal of __do_IRQ().
irq-mb93093.c even lacks an implementation, but nobody noticed that it's broken since commit 88d6e1 in 2006.
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq-mb93093.c | 1 - arch/frv/kernel/irq.c | 6 ------ 2 files changed, 7 deletions(-)
arch/frv/kernel/irq-mb93093.c +0 -1
@@ -73,7 +73,6 @@ static struct irq_chip frv_fpga_pic = { .mask = frv_fpga_mask, .mask_ack = frv_fpga_mask_ack, .unmask = frv_fpga_unmask, - .end = frv_fpga_end, };/*
arch/frv/kernel/irq.c +0 -6
@@ -118,18 +118,12 @@ static void frv_cpupic_unmask(unsigned i__clr_MASK (irqlevel); } -static void frv_cpupic_end (unsigned int irqlevel) -{ -__clr_MASK (irqlevel); -} -static struct irq_chip frv_cpu_pic = { .name ="cpu" , .ack = frv_cpupic_ack, .mask = frv_cpupic_mask, .mask_ack = frv_cpupic_mask_ack, .unmask = frv_cpupic_unmask, - .end = frv_cpupic_end, };/*
PATCH 2/7 frv: Fix typo from __do_IRQ overhaul
In reply to Thomas GleixnerCompiles way better.
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq-mb93093.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/frv/kernel/irq-mb93093.c +1 -1
@@ -93,7 +93,7 @@ static irqreturn_t fpga_interrupt(int ir irq =31 - irq; mask &= ~(1 << irq); -generic_irq_handle (IRQ_BASE_FPGA + irq); +generic_handle_irq (IRQ_BASE_FPGA + irq); }return IRQ_HANDLED ;
PATCH 3/7 frv: Convert mb93091 irq_chip to new functions
In reply to Thomas GleixnerSigned-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq-mb93091.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/frv/kernel/irq-mb93091.c +12 -12
@@ -36,45 +36,45 @@/* * on-motherboard FPGA PIC operations */ -static void frv_fpga_mask (unsigned int irq) +static void frv_fpga_mask (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr |=1 << (irq -IRQ_BASE_FPGA ); + imr |=1 << (d->irq -IRQ_BASE_FPGA );__set_IMR (imr); } -static void frv_fpga_ack (unsigned int irq) +static void frv_fpga_ack (struct irq_data *d) {__clr_IFR (1 << (irq -IRQ_BASE_FPGA )); } -static void frv_fpga_mask_ack (unsigned int irq) +static void frv_fpga_mask_ack (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr |=1 << (irq -IRQ_BASE_FPGA ); + imr |=1 << (d->irq -IRQ_BASE_FPGA );__set_IMR (imr); -__clr_IFR (1 << (irq -IRQ_BASE_FPGA )); +__clr_IFR (1 << (d->irq -IRQ_BASE_FPGA )); } -static void frv_fpga_unmask (unsigned int irq) +static void frv_fpga_unmask (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr &= ~(1 << (irq -IRQ_BASE_FPGA )); + imr &= ~(1 << (d->irq -IRQ_BASE_FPGA ));__set_IMR (imr); }static struct irq_chip frv_fpga_pic = { .name ="mb93091" , - .ack = frv_fpga_ack, - .mask = frv_fpga_mask, - .mask_ack = frv_fpga_mask_ack, - .unmask = frv_fpga_unmask, + .irq_ack = frv_fpga_ack, + .irq_mask = frv_fpga_mask, + .irq_mask_ack = frv_fpga_mask_ack, + .irq_unmask = frv_fpga_unmask, };/*
PATCH 4/7 frv: Convert mb93093 irq_chip to new function
In reply to Thomas GleixnerSigned-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq-mb93093.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/frv/kernel/irq-mb93093.c +13 -13
@@ -35,44 +35,44 @@/* * off-CPU FPGA PIC operations */ -static void frv_fpga_mask (unsigned int irq) +static void frv_fpga_mask (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr |=1 << (irq -IRQ_BASE_FPGA ); + imr |=1 << (d->irq -IRQ_BASE_FPGA );__set_IMR (imr); } -static void frv_fpga_ack (unsigned int irq) +static void frv_fpga_ack (struct irq_data *d) { -__clr_IFR (1 << (irq -IRQ_BASE_FPGA )); +__clr_IFR (1 << (d->irq -IRQ_BASE_FPGA )); } -static void frv_fpga_mask_ack (unsigned int irq) +static void frv_fpga_mask_ack (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr |=1 << (irq -IRQ_BASE_FPGA ); + imr |=1 << (d->irq -IRQ_BASE_FPGA );__set_IMR (imr); -__clr_IFR (1 << (irq -IRQ_BASE_FPGA )); +__clr_IFR (1 << (d->irq -IRQ_BASE_FPGA )); } -static void frv_fpga_unmask (unsigned int irq) +static void frv_fpga_unmask (struct irq_data *d) {uint16_t imr =__get_IMR (); - imr &= ~(1 << (irq -IRQ_BASE_FPGA )); + imr &= ~(1 << (d->irq -IRQ_BASE_FPGA ));__set_IMR (imr); }static struct irq_chip frv_fpga_pic = { .name ="mb93093" , - .ack = frv_fpga_ack, - .mask = frv_fpga_mask, - .mask_ack = frv_fpga_mask_ack, - .unmask = frv_fpga_unmask, + .irq_ack = frv_fpga_ack, + .irq_mask = frv_fpga_mask, + .irq_mask_ack = frv_fpga_mask_ack, + .irq_unmask = frv_fpga_unmask, };/*
PATCH 5/7 frv: Convert mb93493 irq_chip to new functions
In reply to Thomas GleixnerSigned-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq-mb93493.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/frv/kernel/irq-mb93493.c +11 -11
@@ -45,46 +45,46 @@* daughter board PIC operations * - there is no way to ACK interrupts in the MB93493 chip */ -static void frv_mb93493_mask (unsigned int irq) +static void frv_mb93493_mask (struct irq_data *d) {uint32_t iqsr;volatile void *piqsr; -if (IRQ_ROUTING & (1 << (irq -IRQ_BASE_MB93493 ))) +if (IRQ_ROUTING & (1 << (d->irq -IRQ_BASE_MB93493 ))) piqsr =__addr_MB93493_IQSR (1 );else piqsr =__addr_MB93493_IQSR (0 ); iqsr =readl (piqsr); - iqsr &= ~(1 << (irq -IRQ_BASE_MB93493 +16 )); + iqsr &= ~(1 << (d->irq -IRQ_BASE_MB93493 +16 ));writel (iqsr, piqsr); } -static void frv_mb93493_ack (unsigned int irq) +static void frv_mb93493_ack (struct irq_data *d) { } -static void frv_mb93493_unmask (unsigned int irq) +static void frv_mb93493_unmask (struct irq_data *d) {uint32_t iqsr;volatile void *piqsr; -if (IRQ_ROUTING & (1 << (irq -IRQ_BASE_MB93493 ))) +if (IRQ_ROUTING & (1 << (d->irq -IRQ_BASE_MB93493 ))) piqsr =__addr_MB93493_IQSR (1 );else piqsr =__addr_MB93493_IQSR (0 ); iqsr =readl (piqsr); - iqsr |=1 << (irq -IRQ_BASE_MB93493 +16 ); + iqsr |=1 << (d->irq -IRQ_BASE_MB93493 +16 );writel (iqsr, piqsr); }static struct irq_chip frv_mb93493_pic = { .name ="mb93093" , - .ack = frv_mb93493_ack, - .mask = frv_mb93493_mask, - .mask_ack = frv_mb93493_mask, - .unmask = frv_mb93493_unmask, + .irq_ack = frv_mb93493_ack, + .irq_mask = frv_mb93493_mask, + .irq_mask_ack = frv_mb93493_mask, + .irq_unmask = frv_mb93493_unmask, };/*
PATCH 6/7 frv: Convert cpu irq_chip to new functions
In reply to Thomas GleixnerSigned-off-by Thomas Gleixner <[email protected]>
--- arch/frv/kernel/irq.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/frv/kernel/irq.c +13 -13
@@ -95,35 +95,35 @@ int show_interrupts(struct seq_file *p,/* * on-CPU PIC operations */ -static void frv_cpupic_ack (unsigned int irqlevel) +static void frv_cpupic_ack (struct irq_data *d) { -__clr_RC (irqlevel); +__clr_RC (d->irq);__clr_IRL (); } -static void frv_cpupic_mask (unsigned int irqlevel) +static void frv_cpupic_mask (struct irq_data *d) { -__set_MASK (irqlevel); +__set_MASK (d->irq); } -static void frv_cpupic_mask_ack (unsigned int irqlevel) +static void frv_cpupic_mask_ack (struct irq_data *d) { -__set_MASK (irqlevel); -__clr_RC (irqlevel); +__set_MASK (d->irq); +__clr_RC (d->irq);__clr_IRL (); } -static void frv_cpupic_unmask (unsigned int irqlevel) +static void frv_cpupic_unmask (struct irq_data *d) { -__clr_MASK (irqlevel); +__clr_MASK (d->irq); }static struct irq_chip frv_cpu_pic = { .name ="cpu" , - .ack = frv_cpupic_ack, - .mask = frv_cpupic_mask, - .mask_ack = frv_cpupic_mask_ack, - .unmask = frv_cpupic_unmask, + .irq_ack = frv_cpupic_ack, + .irq_mask = frv_cpupic_mask, + .irq_mask_ack = frv_cpupic_mask_ack, + .irq_unmask = frv_cpupic_unmask, };/*
PATCH 7/7 frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
In reply to Thomas GleixnerAll chips converted
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/frv/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/frv/Kconfig +1 -0
@@ -6,6 +6,7 @@ config FRV select HAVE_IRQ_WORK select HAVE_PERF_EVENTS select HAVE_GENERIC_HARDIRQS + select GENERIC_HARDIRQS_NO_DEPRECATED config ZONE_DMA bool