Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
mach-pxa
/
sharpsl_pm.c
diff --git
a/kernel/arch/arm/mach-pxa/sharpsl_pm.c
b/kernel/arch/arm/mach-pxa/sharpsl_pm.c
index
051a655
..
bdc0c41
100644
(file)
--- a/
kernel/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/
kernel/arch/arm/mach-pxa/sharpsl_pm.c
@@
-841,11
+841,9
@@
static int sharpsl_pm_probe(struct platform_device *pdev)
sharpsl_pm.charge_mode = CHRG_OFF;
sharpsl_pm.flags = 0;
sharpsl_pm.charge_mode = CHRG_OFF;
sharpsl_pm.flags = 0;
- init_timer(&sharpsl_pm.ac_timer);
- sharpsl_pm.ac_timer.function = sharpsl_ac_timer;
+ setup_timer(&sharpsl_pm.ac_timer, sharpsl_ac_timer, 0UL);
- init_timer(&sharpsl_pm.chrg_full_timer);
- sharpsl_pm.chrg_full_timer.function = sharpsl_chrg_full_timer;
+ setup_timer(&sharpsl_pm.chrg_full_timer, sharpsl_chrg_full_timer, 0UL);
led_trigger_register_simple("sharpsl-charge", &sharpsl_charge_led_trigger);
led_trigger_register_simple("sharpsl-charge", &sharpsl_charge_led_trigger);