[MIPS] Eleminate interrupt migration helper use.

[powerpc.git] / arch / mips / vr41xx / common / vrc4173.c

diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c
index cc52e75..4720a99 100644 (file)
--- a/arch/mips/vr41xx/common/vrc4173.c
+++ b/arch/mips/vr41xx/common/vrc4173.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-2003  MontaVista Software Inc.
  *    Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com>
- *  Copyright (C) 2004  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *  Copyright (C) 2004  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *  Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -321,7 +321,7 @@ static inline void vrc4173_giu_init(void)
 
 void vrc4173_enable_piuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_PIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_PIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -336,7 +336,7 @@ EXPORT_SYMBOL(vrc4173_enable_piuint);
 
 void vrc4173_disable_piuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_PIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_PIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -351,7 +351,7 @@ EXPORT_SYMBOL(vrc4173_disable_piuint);
 
 void vrc4173_enable_aiuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_AIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_AIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -366,7 +366,7 @@ EXPORT_SYMBOL(vrc4173_enable_aiuint);
 
 void vrc4173_disable_aiuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_AIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_AIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -381,7 +381,7 @@ EXPORT_SYMBOL(vrc4173_disable_aiuint);
 
 void vrc4173_enable_kiuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_KIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_KIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -396,7 +396,7 @@ EXPORT_SYMBOL(vrc4173_enable_kiuint);
 
 void vrc4173_disable_kiuint(uint16_t mask)
 {
-       irq_desc_t *desc = irq_desc + VRC4173_KIU_IRQ;
+       struct irq_desc *desc = irq_desc + VRC4173_KIU_IRQ;
        unsigned long flags;
        uint16_t val;
 
@@ -442,7 +442,7 @@ static void end_vrc4173_irq(unsigned int irq)
                enable_vrc4173_irq(irq);
 }
 
-static struct hw_interrupt_type vrc4173_irq_type = {
+static struct irq_chip vrc4173_irq_type = {
        .typename       = "VRC4173",
        .startup        = startup_vrc4173_irq,
        .shutdown       = shutdown_vrc4173_irq,
@@ -483,7 +483,7 @@ static inline int vrc4173_icu_init(int cascade_irq)
        vr41xx_set_irq_level(GIU_IRQ_TO_PIN(cascade_irq), LEVEL_LOW);
 
        for (i = VRC4173_IRQ_BASE; i <= VRC4173_IRQ_LAST; i++)
-                irq_desc[i].handler = &vrc4173_irq_type;
+                irq_desc[i].chip = &vrc4173_irq_type;
 
        return 0;
 }