power: supply: generic-adc-battery: drop jitter delay support

Drop support for configuring IRQ jitter delay by using big
enough fixed value.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/supply/generic-adc-battery.c b/drivers/power/supply/generic-adc-battery.c
index 535972a332b32f65960b63a6b5660125edf91d71..e20894460d7fb5b0ab47c818effd25ae1487cd25 100644 (file)
--- a/drivers/power/supply/generic-adc-battery.c
+++ b/drivers/power/supply/generic-adc-battery.c
@@ -227,12 +227,10 @@ static void gab_work(struct work_struct *work)
 static irqreturn_t gab_charged(int irq, void *dev_id)
 {
        struct gab *adc_bat = dev_id;
-       struct gab_platform_data *pdata = adc_bat->pdata;
-       int delay;
 
-       delay = pdata->jitter_delay ? pdata->jitter_delay : JITTER_DEFAULT;
        schedule_delayed_work(&adc_bat->bat_work,
-                       msecs_to_jiffies(delay));
+                             msecs_to_jiffies(JITTER_DEFAULT));
+
        return IRQ_HANDLED;
 }
 
@@ -358,14 +356,11 @@ static int __maybe_unused gab_suspend(struct device *dev)
 static int __maybe_unused gab_resume(struct device *dev)
 {
        struct gab *adc_bat = dev_get_drvdata(dev);
-       struct gab_platform_data *pdata = adc_bat->pdata;
-       int delay;
-
-       delay = pdata->jitter_delay ? pdata->jitter_delay : JITTER_DEFAULT;
 
        /* Schedule timer to check current status */
        schedule_delayed_work(&adc_bat->bat_work,
-                       msecs_to_jiffies(delay));
+                             msecs_to_jiffies(JITTER_DEFAULT));
+
        return 0;
 }
 

diff --git a/include/linux/power/generic-adc-battery.h b/include/linux/power/generic-adc-battery.h
index c68cbf34cd342bb62b4e1bb7c492dcd09008e198..50eb4bf28286b6672594feacd6b3560298676f2b 100644 (file)
--- a/include/linux/power/generic-adc-battery.h
+++ b/include/linux/power/generic-adc-battery.h
@@ -11,13 +11,10 @@
  * @battery_info:         recommended structure to specify static power supply
  *                        parameters
  * @cal_charge:           calculate charge level.
- * @jitter_delay:         delay required after the interrupt to check battery
- *                       status.Default set is 10ms.
  */
 struct gab_platform_data {
        struct power_supply_info battery_info;
        int     (*cal_charge)(long value);
-       int     jitter_delay;
 };
 
 #endif /* GENERIC_ADC_BATTERY_H */