4 files changed, 27 insertions, 151 deletions

diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c
index 77fe2454f5b..42e127683ae 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -37,48 +37,36 @@
 /* Forwad definitions for all pic's                                               */
 /**********************************************************************************/
 
-static unsigned int tx4938_irq_cp0_startup(unsigned int irq);
-static void tx4938_irq_cp0_shutdown(unsigned int irq);
 static void tx4938_irq_cp0_enable(unsigned int irq);
 static void tx4938_irq_cp0_disable(unsigned int irq);
-static void tx4938_irq_cp0_mask_and_ack(unsigned int irq);
 static void tx4938_irq_cp0_end(unsigned int irq);
 
-static unsigned int tx4938_irq_pic_startup(unsigned int irq);
-static void tx4938_irq_pic_shutdown(unsigned int irq);
 static void tx4938_irq_pic_enable(unsigned int irq);
 static void tx4938_irq_pic_disable(unsigned int irq);
-static void tx4938_irq_pic_mask_and_ack(unsigned int irq);
 static void tx4938_irq_pic_end(unsigned int irq);
 
 /**********************************************************************************/
 /* Kernel structs for all pic's                                                   */
 /**********************************************************************************/
-DEFINE_SPINLOCK(tx4938_cp0_lock);
-DEFINE_SPINLOCK(tx4938_pic_lock);
 
 #define TX4938_CP0_NAME "TX4938-CP0"
 static struct irq_chip tx4938_irq_cp0_type = {
         .typename = TX4938_CP0_NAME,
-        .startup = tx4938_irq_cp0_startup,
-        .shutdown = tx4938_irq_cp0_shutdown,
-        .enable = tx4938_irq_cp0_enable,
-        .disable = tx4938_irq_cp0_disable,
-        .ack = tx4938_irq_cp0_mask_and_ack,
+        .ack = tx4938_irq_cp0_disable,
+        .mask = tx4938_irq_cp0_disable,
+        .mask_ack = tx4938_irq_cp0_disable,
+        .unmask = tx4938_irq_cp0_enable,
         .end = tx4938_irq_cp0_end,
-        .set_affinity = NULL
 };
 
 #define TX4938_PIC_NAME "TX4938-PIC"
 static struct irq_chip tx4938_irq_pic_type = {
         .typename = TX4938_PIC_NAME,
-        .startup = tx4938_irq_pic_startup,
-        .shutdown = tx4938_irq_pic_shutdown,
-        .enable = tx4938_irq_pic_enable,
-        .disable = tx4938_irq_pic_disable,
-        .ack = tx4938_irq_pic_mask_and_ack,
+        .ack = tx4938_irq_pic_disable,
+        .mask = tx4938_irq_pic_disable,
+        .mask_ack = tx4938_irq_pic_disable,
+        .unmask = tx4938_irq_pic_enable,
         .end = tx4938_irq_pic_end,
-        .set_affinity = NULL
 };
 
 static struct irqaction tx4938_irq_pic_action = {
@@ -99,56 +87,21 @@ tx4938_irq_cp0_init(void)
 {
         int i;
 
-        for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &tx4938_irq_cp0_type;
-        }
-}
-
-static unsigned int
-tx4938_irq_cp0_startup(unsigned int irq)
-{
-        tx4938_irq_cp0_enable(irq);
-
-        return 0;
-}
-
-static void
-tx4938_irq_cp0_shutdown(unsigned int irq)
-{
-        tx4938_irq_cp0_disable(irq);
+        for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++)
+                set_irq_chip_and_handler(i, &tx4938_irq_cp0_type,
+                                         handle_level_irq);
 }
 
 static void
 tx4938_irq_cp0_enable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_cp0_lock, flags);
-
         set_c0_status(tx4938_irq_cp0_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_cp0_lock, flags);
 }
 
 static void
 tx4938_irq_cp0_disable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_cp0_lock, flags);
-
         clear_c0_status(tx4938_irq_cp0_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_cp0_lock, flags);
-}
-
-static void
-tx4938_irq_cp0_mask_and_ack(unsigned int irq)
-{
-        tx4938_irq_cp0_disable(irq);
 }
 
 static void
@@ -290,70 +243,30 @@ tx4938_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, unsigned set_bits)
 static void __init
 tx4938_irq_pic_init(void)
 {
-        unsigned long flags;
         int i;
 
-        for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &tx4938_irq_pic_type;
-        }
+        for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++)
+                set_irq_chip_and_handler(i, &tx4938_irq_pic_type,
+                                         handle_level_irq);
 
         setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
 
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         TX4938_WR(0xff1ff640, 0x6);     /* irq level mask -- only accept hightest */
         TX4938_WR(0xff1ff600, TX4938_RD(0xff1ff600) | 0x1);     /* irq enable */
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
-}
-
-static unsigned int
-tx4938_irq_pic_startup(unsigned int irq)
-{
-        tx4938_irq_pic_enable(irq);
-
-        return 0;
-}
-
-static void
-tx4938_irq_pic_shutdown(unsigned int irq)
-{
-        tx4938_irq_pic_disable(irq);
 }
 
 static void
 tx4938_irq_pic_enable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), 0,
                               tx4938_irq_pic_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
 }
 
 static void
 tx4938_irq_pic_disable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq),
                               tx4938_irq_pic_mask(irq), 0);
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
-}
-
-static void
-tx4938_irq_pic_mask_and_ack(unsigned int irq)
-{
-        tx4938_irq_pic_disable(irq);
 }
 
 static void
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index f415a1f18fb..dc87d92bb08 100644
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -31,7 +31,6 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/time.h>
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 102e473c10a..8c87a35f306 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -87,25 +87,18 @@ IRQ  Device
 #include <linux/bootmem.h>
 #include <asm/tx4938/rbtx4938.h>
 
-static unsigned int toshiba_rbtx4938_irq_ioc_startup(unsigned int irq);
-static void toshiba_rbtx4938_irq_ioc_shutdown(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq);
-static void toshiba_rbtx4938_irq_ioc_mask_and_ack(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_end(unsigned int irq);
 
-DEFINE_SPINLOCK(toshiba_rbtx4938_ioc_lock);
-
 #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC"
 static struct irq_chip toshiba_rbtx4938_irq_ioc_type = {
         .typename = TOSHIBA_RBTX4938_IOC_NAME,
-        .startup = toshiba_rbtx4938_irq_ioc_startup,
-        .shutdown = toshiba_rbtx4938_irq_ioc_shutdown,
-        .enable = toshiba_rbtx4938_irq_ioc_enable,
-        .disable = toshiba_rbtx4938_irq_ioc_disable,
-        .ack = toshiba_rbtx4938_irq_ioc_mask_and_ack,
+        .ack = toshiba_rbtx4938_irq_ioc_disable,
+        .mask = toshiba_rbtx4938_irq_ioc_disable,
+        .mask_ack = toshiba_rbtx4938_irq_ioc_disable,
+        .unmask = toshiba_rbtx4938_irq_ioc_enable,
         .end = toshiba_rbtx4938_irq_ioc_end,
-        .set_affinity = NULL
 };
 
 #define TOSHIBA_RBTX4938_IOC_INTR_ENAB 0xb7f02000
@@ -142,69 +135,36 @@ toshiba_rbtx4938_irq_ioc_init(void)
         int i;
 
         for (i = TOSHIBA_RBTX4938_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4938_IRQ_IOC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 3;
-                irq_desc[i].chip = &toshiba_rbtx4938_irq_ioc_type;
-        }
+             i <= TOSHIBA_RBTX4938_IRQ_IOC_END; i++)
+                set_irq_chip_and_handler(i, &toshiba_rbtx4938_irq_ioc_type,
+                                         handle_level_irq);
 
         setup_irq(RBTX4938_IRQ_IOCINT,
                   &toshiba_rbtx4938_irq_ioc_action);
 }
 
-static unsigned int
-toshiba_rbtx4938_irq_ioc_startup(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_enable(irq);
-
-        return 0;
-}
-
-static void
-toshiba_rbtx4938_irq_ioc_shutdown(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_disable(irq);
-}
-
 static void
 toshiba_rbtx4938_irq_ioc_enable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
-        spin_lock_irqsave(&toshiba_rbtx4938_ioc_lock, flags);
-
         v = TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
         v |= (1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
         TX4938_WR08(TOSHIBA_RBTX4938_IOC_INTR_ENAB, v);
         mmiowb();
         TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4938_ioc_lock, flags);
 }
 
 static void
 toshiba_rbtx4938_irq_ioc_disable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
-        spin_lock_irqsave(&toshiba_rbtx4938_ioc_lock, flags);
-
         v = TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
         v &= ~(1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
         TX4938_WR08(TOSHIBA_RBTX4938_IOC_INTR_ENAB, v);
         mmiowb();
         TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4938_ioc_lock, flags);
-}
-
-static void
-toshiba_rbtx4938_irq_ioc_mask_and_ack(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_disable(irq);
 }
 
 static void
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c b/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
index b926e6a75c2..08b20cdfd7b 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
@@ -36,14 +36,18 @@ void __init txx9_spi_init(unsigned long base, int (*cs_func)(int chipid, int on)
 
 static DECLARE_WAIT_QUEUE_HEAD(txx9_spi_wait);
 
-static void txx9_spi_interrupt(int irq, void *dev_id)
+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);
+
+        return IRQ_HANDLED;
 }
+
 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)