shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

power: battery: setup_timer() -> timer_setup()

Browse Source 
Change-Id: I4980d5665d2465ddba0df8a078f44a83037ce285
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
This commit is contained in:
Shengfei Xu
2019-10-14 11:29:10 +08:00
committed by Tao Huang
parent 833f9df6a7
commit 647c53f05e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/power/supply/rk816_battery.c
View File

@@ -2298,9 +2298,9 @@ static void rk816_bat_init_poffset(struct rk816_battery *di)
di->poffset = coffset - ioffset;
}
static void rk816_bat_caltimer_isr(unsigned long data)
static void rk816_bat_caltimer_isr(struct timer_list *t)
{
struct rk816_battery *di = (struct rk816_battery *)data;
struct rk816_battery *di = from_timer(di, t, caltimer);
mod_timer(&di->caltimer, jiffies + MINUTE(8) * HZ);
queue_delayed_work(di->bat_monitor_wq, &di->calib_delay_work,
@@ -2322,7 +2322,7 @@ static void rk816_bat_internal_calib(struct work_struct *work)
static void rk816_bat_init_caltimer(struct rk816_battery *di)
{
setup_timer(&di->caltimer, rk816_bat_caltimer_isr, (unsigned long)di);
timer_setup(&di->caltimer, rk816_bat_caltimer_isr, 0);
di->caltimer.expires = jiffies + MINUTE(8) * HZ;
add_timer(&di->caltimer);
INIT_DELAYED_WORK(&di->calib_delay_work, rk816_bat_internal_calib);

8
drivers/power/supply/rk817_battery.c
View File

@@ -1690,10 +1690,10 @@ static void rk817_bat_rsoc_init(struct rk817_battery_device *battery)
rk817_bat_save_dsoc(battery, battery->dsoc);
}
static void rk817_bat_caltimer_isr(unsigned long data)
static void rk817_bat_caltimer_isr(struct timer_list *t)
{
struct rk817_battery_device *battery =
(struct rk817_battery_device *)data;
from_timer(battery, t, caltimer);
mod_timer(&battery->caltimer, jiffies + MINUTE(8) * HZ);
queue_delayed_work(battery->bat_monitor_wq,
@@ -1717,9 +1717,9 @@ static void rk817_bat_internal_calib(struct work_struct *work)
static void rk817_bat_init_caltimer(struct rk817_battery_device *battery)
{
setup_timer(&battery->caltimer,
timer_setup(&battery->caltimer,
rk817_bat_caltimer_isr,
(unsigned long)battery);
0);
battery->caltimer.expires = jiffies + MINUTE(8) * HZ;
add_timer(&battery->caltimer);
INIT_DELAYED_WORK(&battery->calib_delay_work, rk817_bat_internal_calib);

6
drivers/power/supply/rk818_battery.c
View File

@@ -1457,9 +1457,9 @@ static void rk818_bat_init_coffset(struct rk818_battery *di)
__func__, di->poffset, ioffset, rk818_bat_get_coffset(di));
}
static void rk818_bat_caltimer_isr(unsigned long data)
static void rk818_bat_caltimer_isr(struct timer_list *t)
{
struct rk818_battery *di = (struct rk818_battery *)data;
struct rk818_battery *di = from_timer(di, t, caltimer);
mod_timer(&di->caltimer, jiffies + MINUTE(8) * HZ);
queue_delayed_work(di->bat_monitor_wq, &di->calib_delay_work,
@@ -1490,7 +1490,7 @@ static void rk818_bat_internal_calib(struct work_struct *work)
static void rk818_bat_init_caltimer(struct rk818_battery *di)
{
setup_timer(&di->caltimer, rk818_bat_caltimer_isr, (unsigned long)di);
timer_setup(&di->caltimer, rk818_bat_caltimer_isr, 0);
di->caltimer.expires = jiffies + MINUTE(8) * HZ;
add_timer(&di->caltimer);
INIT_DELAYED_WORK(&di->calib_delay_work, rk818_bat_internal_calib);