github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

alarmtimers: Remove return value from alarm functions

Browse Source 
Now that the SIG_IGN problem is solved in the core code, the alarmtimer
callbacks do not require a return value anymore.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20241105064214.318837272@linutronix.de
This commit is contained in:
Thomas Gleixner 2024-11-05 09:14:58 +01:00
parent 6b0aa14578
commit 2634303f87
5 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/power/supply/charger-manager.c
View File

@ -1412,10 +1412,9 @@ static inline struct charger_desc *cm_get_drv_data(struct platform_device *pdev)
return dev_get_platdata(&pdev->dev); return dev_get_platdata(&pdev->dev);
} }
static enum alarmtimer_restart cm_timer_func(struct alarm *alarm, ktime_t now) static void cm_timer_func(struct alarm *alarm, ktime_t now)
{ {
cm_timer_set = false; cm_timer_set = false;
return ALARMTIMER_NORESTART;
} }
static int charger_manager_probe(struct platform_device *pdev) static int charger_manager_probe(struct platform_device *pdev)

4
fs/timerfd.c
View File

@ -79,13 +79,11 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)
return HRTIMER_NORESTART; return HRTIMER_NORESTART;
} }
static enum alarmtimer_restart timerfd_alarmproc(struct alarm *alarm, static void timerfd_alarmproc(struct alarm *alarm, ktime_t now)
ktime_t now)
{ {
struct timerfd_ctx *ctx = container_of(alarm, struct timerfd_ctx, struct timerfd_ctx *ctx = container_of(alarm, struct timerfd_ctx,
t.alarm); t.alarm);
timerfd_triggered(ctx); timerfd_triggered(ctx);
return ALARMTIMER_NORESTART;
} }
/* /*

10
include/linux/alarmtimer.h
View File

@ -20,12 +20,6 @@ enum alarmtimer_type {
ALARM_BOOTTIME_FREEZER, ALARM_BOOTTIME_FREEZER,
}; };
enum alarmtimer_restart {
ALARMTIMER_NORESTART,
ALARMTIMER_RESTART,
};
#define ALARMTIMER_STATE_INACTIVE 0x00 #define ALARMTIMER_STATE_INACTIVE 0x00
#define ALARMTIMER_STATE_ENQUEUED 0x01 #define ALARMTIMER_STATE_ENQUEUED 0x01
@ -42,14 +36,14 @@ enum alarmtimer_restart {
struct alarm { struct alarm {
struct timerqueue_node node; struct timerqueue_node node;
struct hrtimer timer; struct hrtimer timer;
enum alarmtimer_restart (*function)(struct alarm *, ktime_t now); void (*function)(struct alarm *, ktime_t now);
enum alarmtimer_type type; enum alarmtimer_type type;
int state; int state;
void *data; void *data;
}; };
void alarm_init(struct alarm *alarm, enum alarmtimer_type type, void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
enum alarmtimer_restart (*function)(struct alarm *, ktime_t)); void (*function)(struct alarm *, ktime_t));
void alarm_start(struct alarm *alarm, ktime_t start); void alarm_start(struct alarm *alarm, ktime_t start);
void alarm_start_relative(struct alarm *alarm, ktime_t start); void alarm_start_relative(struct alarm *alarm, ktime_t start);
void alarm_restart(struct alarm *alarm); void alarm_restart(struct alarm *alarm);

16
kernel/time/alarmtimer.c
View File

@ -321,7 +321,7 @@ static int alarmtimer_resume(struct device *dev)
static void static void
__alarm_init(struct alarm *alarm, enum alarmtimer_type type, __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
enum alarmtimer_restart (*function)(struct alarm *, ktime_t)) void (*function)(struct alarm *, ktime_t))
{ {
timerqueue_init(&alarm->node); timerqueue_init(&alarm->node);
alarm->timer.function = alarmtimer_fired; alarm->timer.function = alarmtimer_fired;
@ -337,7 +337,7 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
* @function: callback that is run when the alarm fires * @function: callback that is run when the alarm fires
*/ */
void alarm_init(struct alarm *alarm, enum alarmtimer_type type, void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
enum alarmtimer_restart (*function)(struct alarm *, ktime_t)) void (*function)(struct alarm *, ktime_t))
{ {
hrtimer_init(&alarm->timer, alarm_bases[type].base_clockid, hrtimer_init(&alarm->timer, alarm_bases[type].base_clockid,
HRTIMER_MODE_ABS); HRTIMER_MODE_ABS);
@ -530,14 +530,12 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)
* *
* Return: whether the timer is to be restarted * Return: whether the timer is to be restarted
*/ */
static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm, ktime_t now) static void alarm_handle_timer(struct alarm *alarm, ktime_t now)
{ {
struct k_itimer *ptr = container_of(alarm, struct k_itimer, it.alarm.alarmtimer); struct k_itimer *ptr = container_of(alarm, struct k_itimer, it.alarm.alarmtimer);
guard(spinlock_irqsave)(&ptr->it_lock); guard(spinlock_irqsave)(&ptr->it_lock);
posix_timer_queue_signal(ptr); posix_timer_queue_signal(ptr);
return ALARMTIMER_NORESTART;
} }
/** /**
@ -698,18 +696,14 @@ static int alarm_timer_create(struct k_itimer *new_timer)
* @now: time at the timer expiration * @now: time at the timer expiration
* *
* Wakes up the task that set the alarmtimer * Wakes up the task that set the alarmtimer
*
* Return: ALARMTIMER_NORESTART
*/ */
static enum alarmtimer_restart alarmtimer_nsleep_wakeup(struct alarm *alarm, static void alarmtimer_nsleep_wakeup(struct alarm *alarm, ktime_t now)
ktime_t now)
{ {
struct task_struct *task = alarm->data; struct task_struct *task = alarm->data;
alarm->data = NULL; alarm->data = NULL;
if (task) if (task)
wake_up_process(task); wake_up_process(task);
return ALARMTIMER_NORESTART;
} }
/** /**
@ -761,7 +755,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,
static void static void
alarm_init_on_stack(struct alarm *alarm, enum alarmtimer_type type, alarm_init_on_stack(struct alarm *alarm, enum alarmtimer_type type,
enum alarmtimer_restart (*function)(struct alarm *, ktime_t)) void (*function)(struct alarm *, ktime_t))
{ {
hrtimer_init_on_stack(&alarm->timer, alarm_bases[type].base_clockid, hrtimer_init_on_stack(&alarm->timer, alarm_bases[type].base_clockid,
HRTIMER_MODE_ABS); HRTIMER_MODE_ABS);

4
net/netfilter/xt_IDLETIMER.c
View File

@ -107,14 +107,12 @@ static void idletimer_tg_expired(struct timer_list *t)
schedule_work(&timer->work); schedule_work(&timer->work);
} }
static enum alarmtimer_restart idletimer_tg_alarmproc(struct alarm *alarm, static void idletimer_tg_alarmproc(struct alarm *alarm, ktime_t now)
ktime_t now)
{ {
struct idletimer_tg *timer = alarm->data; struct idletimer_tg *timer = alarm->data;
pr_debug("alarm %s expired\n", timer->attr.attr.name); pr_debug("alarm %s expired\n", timer->attr.attr.name);
schedule_work(&timer->work); schedule_work(&timer->work);
return ALARMTIMER_NORESTART;
} }
static int idletimer_check_sysfs_name(const char *name, unsigned int size) static int idletimer_check_sysfs_name(const char *name, unsigned int size)