summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorFrans Klaver <frans.klaver@xsens.com>2015-01-14 09:15:42 +0100
committerSebastian Reichel <sre@kernel.org>2015-01-20 13:58:30 +0100
commit5689b786f77308e7aa10fd736e87b270ae42026e (patch)
tree7f3fd93f75bca9e439f01af49e5289d73c216ead /drivers/power
parent5c3faad29b266da015e3726cff6556df5c3cd9f5 (diff)
downloadlwn-5689b786f77308e7aa10fd736e87b270ae42026e.tar.gz
lwn-5689b786f77308e7aa10fd736e87b270ae42026e.zip
power: reset: ltc2952: fix C++ style function pointers
The function pointers for the timers and pm_power_off are assigned with C++ style foo = &func; Let's change it instead to the more C style foo = func; Signed-off-by: Frans Klaver <frans.klaver@xsens.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/reset/ltc2952-poweroff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 736af3961019..8e04b3299f9a 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -182,10 +182,10 @@ static void ltc2952_poweroff_default(struct ltc2952_poweroff *data)
data->trigger_delay = ktime_set(2, 500L*1E6L);
hrtimer_init(&data->timer_trigger, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- data->timer_trigger.function = &ltc2952_poweroff_timer_trigger;
+ data->timer_trigger.function = ltc2952_poweroff_timer_trigger;
hrtimer_init(&data->timer_wde, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- data->timer_wde.function = &ltc2952_poweroff_timer_wde;
+ data->timer_wde.function = ltc2952_poweroff_timer_wde;
}
static int ltc2952_poweroff_init(struct platform_device *pdev)
@@ -270,7 +270,7 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev)
/* TODO: remove ltc2952_data */
ltc2952_data = data;
- pm_power_off = &ltc2952_poweroff_kill;
+ pm_power_off = ltc2952_poweroff_kill;
data->panic_notifier.notifier_call = ltc2952_poweroff_notify_panic;
atomic_notifier_chain_register(&panic_notifier_list,