[ARM] Remove compatibility layer for ARM irqs
set_irq_chipdata -> set_irq_chip_data get_irq_chipdata -> get_irq_chip_data do_level_IRQ -> handle_level_irq do_edge_IRQ -> handle_edge_irq do_simple_IRQ -> handle_simple_irq irqdesc -> irq_desc irqchip -> irq_chip Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:

committed by
Russell King

parent
127e477e0c
commit
10dd5ce28d
@@ -101,7 +101,7 @@ static void inline unmask_gpio_irq(u32 irq)
|
||||
|
||||
static void
|
||||
h720x_gpio_handler(unsigned int mask, unsigned int irq,
|
||||
struct irqdesc *desc)
|
||||
struct irq_desc *desc)
|
||||
{
|
||||
IRQDBG("%s irq: %d\n",__FUNCTION__,irq);
|
||||
desc = irq_desc + irq;
|
||||
@@ -117,7 +117,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq,
|
||||
}
|
||||
|
||||
static void
|
||||
h720x_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
h720x_gpioa_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
@@ -128,7 +128,7 @@ h720x_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
}
|
||||
|
||||
static void
|
||||
h720x_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
h720x_gpiob_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
mask = CPU_REG(GPIO_B_VIRT,GPIO_STAT);
|
||||
@@ -138,7 +138,7 @@ h720x_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
}
|
||||
|
||||
static void
|
||||
h720x_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
h720x_gpioc_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
@@ -149,7 +149,7 @@ h720x_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
}
|
||||
|
||||
static void
|
||||
h720x_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
h720x_gpiod_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
@@ -161,7 +161,7 @@ h720x_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
|
||||
#ifdef CONFIG_CPU_H7202
|
||||
static void
|
||||
h720x_gpioe_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
h720x_gpioe_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
@@ -172,13 +172,13 @@ h720x_gpioe_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct irqchip h720x_global_chip = {
|
||||
static struct irq_chip h720x_global_chip = {
|
||||
.ack = mask_global_irq,
|
||||
.mask = mask_global_irq,
|
||||
.unmask = unmask_global_irq,
|
||||
};
|
||||
|
||||
static struct irqchip h720x_gpio_chip = {
|
||||
static struct irq_chip h720x_gpio_chip = {
|
||||
.ack = ack_gpio_irq,
|
||||
.mask = mask_gpio_irq,
|
||||
.unmask = unmask_gpio_irq,
|
||||
@@ -203,14 +203,14 @@ void __init h720x_init_irq (void)
|
||||
/* Initialize global IRQ's, fast path */
|
||||
for (irq = 0; irq < NR_GLBL_IRQS; irq++) {
|
||||
set_irq_chip(irq, &h720x_global_chip);
|
||||
set_irq_handler(irq, do_level_IRQ);
|
||||
set_irq_handler(irq, handle_level_irq);
|
||||
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
|
||||
}
|
||||
|
||||
/* Initialize multiplexed IRQ's, slow path */
|
||||
for (irq = IRQ_CHAINED_GPIOA(0) ; irq <= IRQ_CHAINED_GPIOD(31); irq++) {
|
||||
set_irq_chip(irq, &h720x_gpio_chip);
|
||||
set_irq_handler(irq, do_edge_IRQ);
|
||||
set_irq_handler(irq, handle_edge_irq);
|
||||
set_irq_flags(irq, IRQF_VALID );
|
||||
}
|
||||
set_irq_chained_handler(IRQ_GPIOA, h720x_gpioa_demux_handler);
|
||||
@@ -221,7 +221,7 @@ void __init h720x_init_irq (void)
|
||||
#ifdef CONFIG_CPU_H7202
|
||||
for (irq = IRQ_CHAINED_GPIOE(0) ; irq <= IRQ_CHAINED_GPIOE(31); irq++) {
|
||||
set_irq_chip(irq, &h720x_gpio_chip);
|
||||
set_irq_handler(irq, do_edge_IRQ);
|
||||
set_irq_handler(irq, handle_edge_irq);
|
||||
set_irq_flags(irq, IRQF_VALID );
|
||||
}
|
||||
set_irq_chained_handler(IRQ_GPIOE, h720x_gpioe_demux_handler);
|
||||
|
Reference in New Issue
Block a user