aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/pda_power.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-07-14 19:12:04 -0400
committerAnton Vorontsov <cbou@mail.ru>2007-07-15 14:32:03 -0400
commit5ebf6e6a96e41220edec23a90e4140985d1a5732 (patch)
tree3ad37208eb90bb8ce530ee0befe99c192868ba1e /drivers/power/pda_power.c
parent3be86148e7b394b5de2aeb720004f9788a66c300 (diff)
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>
Diffstat (limited to 'drivers/power/pda_power.c')
-rw-r--r--drivers/power/pda_power.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 4e1eb040e148..cdc28923e0ce 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -101,32 +101,31 @@ static void update_charger(void)
101 return; 101 return;
102} 102}
103 103
104static void supply_timer_func(unsigned long irq) 104static void supply_timer_func(unsigned long power_supply_ptr)
105{ 105{
106 if (ac_irq && irq == ac_irq->start) 106 void *power_supply = (void *)power_supply_ptr;
107 power_supply_changed(&pda_power_supplies[0]); 107
108 else if (usb_irq && irq == usb_irq->start) 108 power_supply_changed(power_supply);
109 power_supply_changed(&pda_power_supplies[1]);
110 return; 109 return;
111} 110}
112 111
113static void charger_timer_func(unsigned long irq) 112static void charger_timer_func(unsigned long power_supply_ptr)
114{ 113{
115 update_charger(); 114 update_charger();
116 115
117 /* Okay, charger set. Now wait a bit before notifying supplicants, 116 /* Okay, charger set. Now wait a bit before notifying supplicants,
118 * charge power should stabilize. */ 117 * charge power should stabilize. */
119 supply_timer.data = irq; 118 supply_timer.data = power_supply_ptr;
120 mod_timer(&supply_timer, 119 mod_timer(&supply_timer,
121 jiffies + msecs_to_jiffies(pdata->wait_for_charger)); 120 jiffies + msecs_to_jiffies(pdata->wait_for_charger));
122 return; 121 return;
123} 122}
124 123
125static irqreturn_t power_changed_isr(int irq, void *unused) 124static irqreturn_t power_changed_isr(int irq, void *power_supply)
126{ 125{
127 /* Wait a bit before reading ac/usb line status and setting charger, 126 /* Wait a bit before reading ac/usb line status and setting charger,
128 * because ac/usb status readings may lag from irq. */ 127 * because ac/usb status readings may lag from irq. */
129 charger_timer.data = irq; 128 charger_timer.data = (unsigned long)power_supply;
130 mod_timer(&charger_timer, 129 mod_timer(&charger_timer,
131 jiffies + msecs_to_jiffies(pdata->wait_for_status)); 130 jiffies + msecs_to_jiffies(pdata->wait_for_status));
132 return IRQ_HANDLED; 131 return IRQ_HANDLED;