pda_power: clean up irq, timer

Clean up pda_power interrupt handling:

Prior to this patch, the driver would pass information it needed
to the interrupt handler dev_id pointer, and then prompt forget it
ever did so, recreating that same information after a couple passes
through the timer-based state machine.

This patch removes the redundant checks by passing the
pda_power_supply[] pointer through the state machine.  The current
code passed 'irq' through the state machine, as an index to recreate
the pointer, when we could more simply pass around the pointer itself.

This patch makes it easier to remove the 'irq' argument in the future,
in addition to cleaning up the driver today.

Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 4e1eb040e1480bd2da69577dd90839bbae88c9a6..cdc28923e0cec9ab45b52326b5dc272705500d15 100644 (file)
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -101,32 +101,31 @@ static void update_charger(void)
        return;
 }
 
-static void supply_timer_func(unsigned long irq)
+static void supply_timer_func(unsigned long power_supply_ptr)
 {
-       if (ac_irq && irq == ac_irq->start)
-               power_supply_changed(&pda_power_supplies[0]);
-       else if (usb_irq && irq == usb_irq->start)
-               power_supply_changed(&pda_power_supplies[1]);
+       void *power_supply = (void *)power_supply_ptr;
+
+       power_supply_changed(power_supply);
        return;
 }
 
-static void charger_timer_func(unsigned long irq)
+static void charger_timer_func(unsigned long power_supply_ptr)
 {
        update_charger();
 
        /* Okay, charger set. Now wait a bit before notifying supplicants,
         * charge power should stabilize. */
-       supply_timer.data = irq;
+       supply_timer.data = power_supply_ptr;
        mod_timer(&supply_timer,
                  jiffies + msecs_to_jiffies(pdata->wait_for_charger));
        return;
 }
 
-static irqreturn_t power_changed_isr(int irq, void *unused)
+static irqreturn_t power_changed_isr(int irq, void *power_supply)
 {
        /* Wait a bit before reading ac/usb line status and setting charger,
         * because ac/usb status readings may lag from irq. */
-       charger_timer.data = irq;
+       charger_timer.data = (unsigned long)power_supply;
        mod_timer(&charger_timer,
                  jiffies + msecs_to_jiffies(pdata->wait_for_status));
        return IRQ_HANDLED;