aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorFrans Klaver <frans.klaver@xsens.com>2015-01-14 03:15:42 -0500
committerSebastian Reichel <sre@kernel.org>2015-01-20 07:58:30 -0500
commit5689b786f77308e7aa10fd736e87b270ae42026e (patch)
tree7f3fd93f75bca9e439f01af49e5289d73c216ead /drivers/power
parent5c3faad29b266da015e3726cff6556df5c3cd9f5 (diff)
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)
182 data->trigger_delay = ktime_set(2, 500L*1E6L); 182 data->trigger_delay = ktime_set(2, 500L*1E6L);
183 183
184 hrtimer_init(&data->timer_trigger, CLOCK_MONOTONIC, HRTIMER_MODE_REL); 184 hrtimer_init(&data->timer_trigger, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
185 data->timer_trigger.function = &ltc2952_poweroff_timer_trigger; 185 data->timer_trigger.function = ltc2952_poweroff_timer_trigger;
186 186
187 hrtimer_init(&data->timer_wde, CLOCK_MONOTONIC, HRTIMER_MODE_REL); 187 hrtimer_init(&data->timer_wde, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
188 data->timer_wde.function = &ltc2952_poweroff_timer_wde; 188 data->timer_wde.function = ltc2952_poweroff_timer_wde;
189} 189}
190 190
191static int ltc2952_poweroff_init(struct platform_device *pdev) 191static int ltc2952_poweroff_init(struct platform_device *pdev)
@@ -270,7 +270,7 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev)
270 270
271 /* TODO: remove ltc2952_data */ 271 /* TODO: remove ltc2952_data */
272 ltc2952_data = data; 272 ltc2952_data = data;
273 pm_power_off = &ltc2952_poweroff_kill; 273 pm_power_off = ltc2952_poweroff_kill;
274 274
275 data->panic_notifier.notifier_call = ltc2952_poweroff_notify_panic; 275 data->panic_notifier.notifier_call = ltc2952_poweroff_notify_panic;
276 atomic_notifier_chain_register(&panic_notifier_list, 276 atomic_notifier_chain_register(&panic_notifier_list,