Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -146,13 +146,13 @@ imx_gpio_unmask_irq(unsigned int irq)
|
||||
|
||||
static void
|
||||
imx_gpio_handler(unsigned int mask, unsigned int irq,
|
||||
struct irqdesc *desc, struct pt_regs *regs)
|
||||
struct irqdesc *desc)
|
||||
{
|
||||
desc = irq_desc + irq;
|
||||
while (mask) {
|
||||
if (mask & 1) {
|
||||
DEBUG_IRQ("handling irq %d\n", irq);
|
||||
desc_handle_irq(irq, desc, regs);
|
||||
desc_handle_irq(irq, desc);
|
||||
}
|
||||
irq++;
|
||||
desc++;
|
||||
@@ -161,47 +161,43 @@ imx_gpio_handler(unsigned int mask, unsigned int irq,
|
||||
}
|
||||
|
||||
static void
|
||||
imx_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
|
||||
struct pt_regs *regs)
|
||||
imx_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
mask = ISR(0);
|
||||
irq = IRQ_GPIOA(0);
|
||||
imx_gpio_handler(mask, irq, desc, regs);
|
||||
imx_gpio_handler(mask, irq, desc);
|
||||
}
|
||||
|
||||
static void
|
||||
imx_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
|
||||
struct pt_regs *regs)
|
||||
imx_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
mask = ISR(1);
|
||||
irq = IRQ_GPIOB(0);
|
||||
imx_gpio_handler(mask, irq, desc, regs);
|
||||
imx_gpio_handler(mask, irq, desc);
|
||||
}
|
||||
|
||||
static void
|
||||
imx_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
|
||||
struct pt_regs *regs)
|
||||
imx_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
mask = ISR(2);
|
||||
irq = IRQ_GPIOC(0);
|
||||
imx_gpio_handler(mask, irq, desc, regs);
|
||||
imx_gpio_handler(mask, irq, desc);
|
||||
}
|
||||
|
||||
static void
|
||||
imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
|
||||
struct pt_regs *regs)
|
||||
imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
|
||||
{
|
||||
unsigned int mask, irq;
|
||||
|
||||
mask = ISR(3);
|
||||
irq = IRQ_GPIOD(0);
|
||||
imx_gpio_handler(mask, irq, desc, regs);
|
||||
imx_gpio_handler(mask, irq, desc);
|
||||
}
|
||||
|
||||
static struct irq_chip imx_internal_chip = {
|
||||
|
Reference in New Issue
Block a user