@@ -324,7 +324,6 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
324
324
void (* function )(struct alarm * , ktime_t ))
325
325
{
326
326
timerqueue_init (& alarm -> node );
327
- alarm -> timer .function = alarmtimer_fired ;
328
327
alarm -> function = function ;
329
328
alarm -> type = type ;
330
329
alarm -> state = ALARMTIMER_STATE_INACTIVE ;
@@ -339,8 +338,8 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
339
338
void alarm_init (struct alarm * alarm , enum alarmtimer_type type ,
340
339
void (* function )(struct alarm * , ktime_t ))
341
340
{
342
- hrtimer_init (& alarm -> timer , alarm_bases [type ].base_clockid ,
343
- HRTIMER_MODE_ABS );
341
+ hrtimer_setup (& alarm -> timer , alarmtimer_fired , alarm_bases [type ].base_clockid ,
342
+ HRTIMER_MODE_ABS );
344
343
__alarm_init (alarm , type , function );
345
344
}
346
345
EXPORT_SYMBOL_GPL (alarm_init );
@@ -757,8 +756,8 @@ static void
757
756
alarm_init_on_stack (struct alarm * alarm , enum alarmtimer_type type ,
758
757
void (* function )(struct alarm * , ktime_t ))
759
758
{
760
- hrtimer_init_on_stack (& alarm -> timer , alarm_bases [type ].base_clockid ,
761
- HRTIMER_MODE_ABS );
759
+ hrtimer_setup_on_stack (& alarm -> timer , alarmtimer_fired , alarm_bases [type ].base_clockid ,
760
+ HRTIMER_MODE_ABS );
762
761
__alarm_init (alarm , type , function );
763
762
}
764
763
0 commit comments