Commit c0f1e790 authored by Russell King's avatar Russell King

[ARM] Fix more missing irqreturn_t and remove a static no_action func.

parent c2e2d4f7
...@@ -84,10 +84,6 @@ static struct irqchip isa_hi_chip = { ...@@ -84,10 +84,6 @@ static struct irqchip isa_hi_chip = {
.unmask = isa_unmask_pic_hi_irq, .unmask = isa_unmask_pic_hi_irq,
}; };
static void no_action(int irq, void *dev_id, struct pt_regs *regs)
{
}
static void static void
isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
{ {
......
...@@ -441,7 +441,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) ...@@ -441,7 +441,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
return 1; return 1;
} }
static void v3_irq(int irq, void *devid, struct pt_regs *regs) static irqreturn_t v3_irq(int irq, void *devid, struct pt_regs *regs)
{ {
#ifdef CONFIG_DEBUG_LL #ifdef CONFIG_DEBUG_LL
unsigned long pc = instruction_pointer(regs); unsigned long pc = instruction_pointer(regs);
...@@ -469,6 +469,7 @@ static void v3_irq(int irq, void *devid, struct pt_regs *regs) ...@@ -469,6 +469,7 @@ static void v3_irq(int irq, void *devid, struct pt_regs *regs)
printascii(buf); printascii(buf);
} }
#endif #endif
return IRQ_HANDLED;
} }
int __init pci_v3_setup(int nr, struct pci_sys_data *sys) int __init pci_v3_setup(int nr, struct pci_sys_data *sys)
......
...@@ -42,7 +42,7 @@ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS]; ...@@ -42,7 +42,7 @@ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS];
static spinlock_t dma_list_lock; static spinlock_t dma_list_lock;
static void dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
{ {
dma_regs_t *dma_regs = dev_id; dma_regs_t *dma_regs = dev_id;
sa1100_dma_t *dma = dma_chan + (((u_int)dma_regs >> 5) & 7); sa1100_dma_t *dma = dma_chan + (((u_int)dma_regs >> 5) & 7);
...@@ -60,6 +60,7 @@ static void dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs) ...@@ -60,6 +60,7 @@ static void dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
if (status & DCSR_DONEB) if (status & DCSR_DONEB)
dma->callback(dma->data); dma->callback(dma->data);
} }
return IRQ_HANDLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment