Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-msm / irq.c

diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
index 04b8d18..6c8d5f8 100644 (file)
--- a/arch/arm/mach-msm/irq.c
+++ b/arch/arm/mach-msm/irq.c
@@ -66,20 +66,20 @@
 
 static void msm_irq_ack(unsigned int irq)
 {
-       unsigned reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0);
+       void __iomem *reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0);
        irq = 1 << (irq & 31);
        writel(irq, reg);
 }
 
 static void msm_irq_mask(unsigned int irq)
 {
-       unsigned reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0);
+       void __iomem *reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0);
        writel(1 << (irq & 31), reg);
 }
 
 static void msm_irq_unmask(unsigned int irq)
 {
-       unsigned reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0);
+       void __iomem *reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0);
        writel(1 << (irq & 31), reg);
 }
 
@@ -90,8 +90,8 @@ static int msm_irq_set_wake(unsigned int irq, unsigned int on)
 
 static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
 {
-       unsigned treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0);
-       unsigned preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0);
+       void __iomem *treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0);
+       void __iomem *preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0);
        int b = 1 << (irq & 31);
 
        if (flow_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))
@@ -101,11 +101,11 @@ static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
 
        if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
                writel(readl(treg) | b, treg);
-               set_irq_handler(irq, handle_edge_irq);
+               irq_desc[irq].handle_irq = handle_edge_irq;
        }
        if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) {
                writel(readl(treg) & (~b), treg);
-               set_irq_handler(irq, handle_level_irq);
+               irq_desc[irq].handle_irq = handle_level_irq;
        }
        return 0;
 }