[PATCH 2/2] pda_power: implement polling
Signed-off-by: Anton Vorontsov <[EMAIL PROTECTED]>
---
Untested, just to show the idea.
drivers/power/pda_power.c | 40
include/linux/pda_power.h |1 +
2 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 153e3b1..8e9aec3 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -32,6 +32,8 @@ static struct pda_power_pdata *pdata;
static struct resource *ac_irq, *usb_irq;
static struct timer_list charger_timer;
static struct timer_list supply_timer;
+static struct timer_list polling_timer;
+static int polling;
enum {
PDA_PSY_OFFLINE = 0,
@@ -166,6 +168,28 @@ static irqreturn_t power_changed_isr(int irq, void
*power_supply)
return IRQ_HANDLED;
}
+static void polling_timer_func(unsigned long unused)
+{
+ int changed = 0;
+
+ dev_vdbg(dev, "polling...\n");
+
+ update_status();
+
+ if (!ac_irq && new_ac_status != ac_status) {
+ ac_status = PDA_PSY_TO_CHANGE;
+ changed = 1;
+ }
+
+ if (!usb_irq && new_usb_status != usb_status) {
+ usb_status = PDA_PSY_TO_CHANGE;
+ changed = 1;
+ }
+
+ if (changed)
+ psy_changed();
+}
+
static int pda_power_probe(struct platform_device *pdev)
{
int ret = 0;
@@ -190,6 +214,9 @@ static int pda_power_probe(struct platform_device *pdev)
if (!pdata->wait_for_charger)
pdata->wait_for_charger = 500;
+ if (!pdata->polling_interval)
+ pdata->polling_interval = 2000;
+
setup_timer(_timer, charger_timer_func, 0);
setup_timer(_timer, supply_timer_func, 0);
@@ -219,6 +246,8 @@ static int pda_power_probe(struct platform_device *pdev)
dev_err(dev, "request ac irq failed\n");
goto ac_irq_failed;
}
+ } else {
+ polling = 1;
}
}
@@ -238,9 +267,18 @@ static int pda_power_probe(struct platform_device *pdev)
dev_err(dev, "request usb irq failed\n");
goto usb_irq_failed;
}
+ } else {
+ polling = 1;
}
}
+ if (polling) {
+ dev_dbg(dev, "will poll for status\n");
+ setup_timer(_timer, polling_timer_func, 0);
+ mod_timer(_timer,
+ jiffies + msecs_to_jiffies(pdata->polling_interval));
+ }
+
return 0;
usb_irq_failed:
@@ -264,6 +302,8 @@ static int pda_power_remove(struct platform_device *pdev)
if (pdata->is_ac_online && ac_irq)
free_irq(ac_irq->start, _psy_ac);
+ if (polling)
+ del_timer_sync(_timer);
del_timer_sync(_timer);
del_timer_sync(_timer);
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index 1375f15..225beb1 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -26,6 +26,7 @@ struct pda_power_pdata {
unsigned int wait_for_status; /* msecs, default is 500 */
unsigned int wait_for_charger; /* msecs, default is 500 */
+ unsigned int polling_interval; /* msecs, default is 2000 */
};
#endif /* __PDA_POWER_H__ */
--
1.5.2.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/2] pda_power: implement polling
Signed-off-by: Anton Vorontsov [EMAIL PROTECTED]
---
Untested, just to show the idea.
drivers/power/pda_power.c | 40
include/linux/pda_power.h |1 +
2 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 153e3b1..8e9aec3 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -32,6 +32,8 @@ static struct pda_power_pdata *pdata;
static struct resource *ac_irq, *usb_irq;
static struct timer_list charger_timer;
static struct timer_list supply_timer;
+static struct timer_list polling_timer;
+static int polling;
enum {
PDA_PSY_OFFLINE = 0,
@@ -166,6 +168,28 @@ static irqreturn_t power_changed_isr(int irq, void
*power_supply)
return IRQ_HANDLED;
}
+static void polling_timer_func(unsigned long unused)
+{
+ int changed = 0;
+
+ dev_vdbg(dev, polling...\n);
+
+ update_status();
+
+ if (!ac_irq new_ac_status != ac_status) {
+ ac_status = PDA_PSY_TO_CHANGE;
+ changed = 1;
+ }
+
+ if (!usb_irq new_usb_status != usb_status) {
+ usb_status = PDA_PSY_TO_CHANGE;
+ changed = 1;
+ }
+
+ if (changed)
+ psy_changed();
+}
+
static int pda_power_probe(struct platform_device *pdev)
{
int ret = 0;
@@ -190,6 +214,9 @@ static int pda_power_probe(struct platform_device *pdev)
if (!pdata-wait_for_charger)
pdata-wait_for_charger = 500;
+ if (!pdata-polling_interval)
+ pdata-polling_interval = 2000;
+
setup_timer(charger_timer, charger_timer_func, 0);
setup_timer(supply_timer, supply_timer_func, 0);
@@ -219,6 +246,8 @@ static int pda_power_probe(struct platform_device *pdev)
dev_err(dev, request ac irq failed\n);
goto ac_irq_failed;
}
+ } else {
+ polling = 1;
}
}
@@ -238,9 +267,18 @@ static int pda_power_probe(struct platform_device *pdev)
dev_err(dev, request usb irq failed\n);
goto usb_irq_failed;
}
+ } else {
+ polling = 1;
}
}
+ if (polling) {
+ dev_dbg(dev, will poll for status\n);
+ setup_timer(polling_timer, polling_timer_func, 0);
+ mod_timer(polling_timer,
+ jiffies + msecs_to_jiffies(pdata-polling_interval));
+ }
+
return 0;
usb_irq_failed:
@@ -264,6 +302,8 @@ static int pda_power_remove(struct platform_device *pdev)
if (pdata-is_ac_online ac_irq)
free_irq(ac_irq-start, pda_psy_ac);
+ if (polling)
+ del_timer_sync(polling_timer);
del_timer_sync(charger_timer);
del_timer_sync(supply_timer);
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index 1375f15..225beb1 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -26,6 +26,7 @@ struct pda_power_pdata {
unsigned int wait_for_status; /* msecs, default is 500 */
unsigned int wait_for_charger; /* msecs, default is 500 */
+ unsigned int polling_interval; /* msecs, default is 2000 */
};
#endif /* __PDA_POWER_H__ */
--
1.5.2.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
