git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
tx4938
/
toshiba_rbtx4938
/
spi_txx9.c
diff --git
a/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
b/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
index
fae3136
..
08b20cd
100644
(file)
--- a/
arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
+++ b/
arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
@@
-35,14
+35,19
@@
void __init txx9_spi_init(unsigned long base, int (*cs_func)(int chipid, int on)
}
static DECLARE_WAIT_QUEUE_HEAD(txx9_spi_wait);
}
static DECLARE_WAIT_QUEUE_HEAD(txx9_spi_wait);
-static void txx9_spi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+
+static irqreturn_t txx9_spi_interrupt(int irq, void *dev_id)
{
/* disable rx intr */
tx4938_spiptr->cr0 &= ~TXx9_SPCR0_RBSIE;
wake_up(&txx9_spi_wait);
{
/* disable rx intr */
tx4938_spiptr->cr0 &= ~TXx9_SPCR0_RBSIE;
wake_up(&txx9_spi_wait);
+
+ return IRQ_HANDLED;
}
}
+
static struct irqaction txx9_spi_action = {
static struct irqaction txx9_spi_action = {
- txx9_spi_interrupt, 0, 0, "spi", NULL, NULL,
+ .handler = txx9_spi_interrupt,
+ .name = "spi",
};
void __init txx9_spi_irqinit(int irc_irq)
};
void __init txx9_spi_irqinit(int irc_irq)