Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44aefd27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dhowells/irq-2.6 

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type
parents c1a26e7d 7d12e780

arch/frv/kernel/dma.c

+2 −3
Original line number Diff line number Diff line
@@ -121,15 +121,14 @@ unsigned long frv_dma_inprogress; 
/*

 * DMA irq handler - determine channel involved, grab status and call real handler

 */

static irqreturn_t dma_irq_handler(int irq, void *_channel, struct pt_regs *regs)

static irqreturn_t dma_irq_handler(int irq, void *_channel)

{

	struct frv_dma_channel *channel = _channel;



	frv_clear_dma_inprogress(channel - frv_dma_channels);

	return channel->handler(channel - frv_dma_channels,

				__get_DMAC(channel->ioaddr, CSTR),

				channel->data,

				regs);

				channel->data);



} /* end dma_irq_handler() */

arch/frv/kernel/irq-mb93091.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct irq_chip frv_fpga_pic = { 
/*

 * FPGA PIC interrupt handler

 */

static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)

static irqreturn_t fpga_interrupt(int irq, void *_mask)

{

	uint16_t imr, mask = (unsigned long) _mask;
@@ -95,7 +95,7 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs) 
		irq = 31 - irq;

		mask &= ~(1 << irq);



		generic_handle_irq(IRQ_BASE_FPGA + irq, regs);

		generic_handle_irq(IRQ_BASE_FPGA + irq);

	}



	return IRQ_HANDLED;

arch/frv/kernel/irq-mb93093.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct irq_chip frv_fpga_pic = { 
/*

 * FPGA PIC interrupt handler

 */

static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)

static irqreturn_t fpga_interrupt(int irq, void *_mask)

{

	uint16_t imr, mask = (unsigned long) _mask;
@@ -94,7 +94,7 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs) 
		irq = 31 - irq;

		mask &= ~(1 << irq);



		generic_irq_handle(IRQ_BASE_FPGA + irq, regs);

		generic_irq_handle(IRQ_BASE_FPGA + irq);

	}



	return IRQ_HANDLED;

arch/frv/kernel/irq-mb93493.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static struct irq_chip frv_mb93493_pic = { 
/*

 * MB93493 PIC interrupt handler

 */

static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs)

static irqreturn_t mb93493_interrupt(int irq, void *_piqsr)

{

	volatile void *piqsr = _piqsr;

	uint32_t iqsr;
@@ -106,7 +106,7 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs 
		irq = 31 - irq;

		iqsr &= ~(1 << irq);



		generic_handle_irq(IRQ_BASE_MB93493 + irq, regs);

		generic_handle_irq(IRQ_BASE_MB93493 + irq);

	}



	return IRQ_HANDLED;

arch/frv/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static struct irq_chip frv_cpu_pic = { 
asmlinkage void do_IRQ(void)

{

	irq_enter();

	generic_handle_irq(__get_IRL(), __frame);

	generic_handle_irq(__get_IRL());

	irq_exit();

}