Commit c8f573f3 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

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



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

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 44263f50

drivers/power/supply/generic-adc-battery.c

+4 −9
Original line number Diff line number Diff line
@@ -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;

}

include/linux/power/generic-adc-battery.h

+0 −3
Original line number Diff line number Diff line
@@ -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 */