MIPS: PNX Removing dead CONFIG_PMCTWILED

[sfrench/cifs-2.6.git] / arch / mips / pmc-sierra / msp71xx / msp_hwbutton.c

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index ab96a2d7f4c4fc63c0c7594918342e0f98b4e489..c841f083a7f55644d1d62829591ef26cdf954c15 100644 (file)
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -32,9 +32,6 @@
 #include <msp_int.h>
 #include <msp_regs.h>
 #include <msp_regops.h>
-#ifdef CONFIG_PMCTWILED
-#include <msp_led_macros.h>
-#endif
 
 /* For hwbutton_interrupt->initial_state */
 #define HWBUTTON_HI    0x1
@@ -82,10 +79,6 @@ static void standby_on(void *data)
        printk(KERN_WARNING "STANDBY switch was set to ON (not implemented)\n");
 
        /* TODO: Put board in standby mode */
-#ifdef CONFIG_PMCTWILED
-       msp_led_turn_off(MSP_LED_PWRSTANDBY_GREEN);
-       msp_led_turn_on(MSP_LED_PWRSTANDBY_RED);
-#endif
 }
 
 static void standby_off(void *data)
@@ -94,10 +87,6 @@ static void standby_off(void *data)
                "STANDBY switch was set to OFF (not implemented)\n");
 
        /* TODO: Take out of standby mode */
-#ifdef CONFIG_PMCTWILED
-       msp_led_turn_on(MSP_LED_PWRSTANDBY_GREEN);
-       msp_led_turn_off(MSP_LED_PWRSTANDBY_RED);
-#endif
 }
 
 static struct hwbutton_interrupt softreset_sw = {
@@ -126,9 +115,6 @@ static irqreturn_t hwbutton_handler(int irq, void *data)
        struct hwbutton_interrupt *hirq = data;
        unsigned long cic_ext = *CIC_EXT_CFG_REG;
 
-       if (irq != hirq->irq)
-               return IRQ_NONE;
-
        if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
                /* Interrupt: pin is now HI */
                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
@@ -164,7 +150,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
        *CIC_EXT_CFG_REG = cic_ext;
 
        return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
-                               hirq->name, (void *)hirq);
+                          hirq->name, hirq);
 }
 
 static int __init msp_hwbutton_setup(void)