Commit 2634303f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

alarmtimers: Remove return value from alarm functions 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20241105064214.318837272@linutronix.de
parent 6b0aa145

drivers/power/supply/charger-manager.c

+1 −2
Original line number Diff line number Diff line
@@ -1412,10 +1412,9 @@ static inline struct charger_desc *cm_get_drv_data(struct platform_device *pdev) 
	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;

	return ALARMTIMER_NORESTART;

}



static int charger_manager_probe(struct platform_device *pdev)

fs/timerfd.c

+1 −3
Original line number Diff line number Diff line
@@ -79,13 +79,11 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr) 
	return HRTIMER_NORESTART;

}



static enum alarmtimer_restart timerfd_alarmproc(struct alarm *alarm,

	ktime_t now)

static void timerfd_alarmproc(struct alarm *alarm, ktime_t now)

{

	struct timerfd_ctx *ctx = container_of(alarm, struct timerfd_ctx,

					       t.alarm);

	timerfd_triggered(ctx);

	return ALARMTIMER_NORESTART;

}



/*

include/linux/alarmtimer.h

+2 −8
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ enum alarmtimer_type { 
	ALARM_BOOTTIME_FREEZER,

};



enum alarmtimer_restart {

	ALARMTIMER_NORESTART,

	ALARMTIMER_RESTART,

};





#define ALARMTIMER_STATE_INACTIVE	0x00

#define ALARMTIMER_STATE_ENQUEUED	0x01
@@ -42,14 +36,14 @@ enum alarmtimer_restart { 
struct alarm {

	struct timerqueue_node	node;

	struct hrtimer		timer;

	enum alarmtimer_restart	(*function)(struct alarm *, ktime_t now);

	void			(*function)(struct alarm *, ktime_t now);

	enum alarmtimer_type	type;

	int			state;

	void			*data;

};



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_relative(struct alarm *alarm, ktime_t start);

void alarm_restart(struct alarm *alarm);

kernel/time/alarmtimer.c

+5 −11
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int alarmtimer_resume(struct device *dev) 


static void

__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);

	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

 */

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_MODE_ABS);
@@ -530,14 +530,12 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid) 
 *

 * 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);



	guard(spinlock_irqsave)(&ptr->it_lock);

	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

 *

 * Wakes up the task that set the alarmtimer

 *

 * Return: ALARMTIMER_NORESTART

 */

static enum alarmtimer_restart alarmtimer_nsleep_wakeup(struct alarm *alarm,

								ktime_t now)

static void alarmtimer_nsleep_wakeup(struct alarm *alarm, ktime_t now)

{

	struct task_struct *task = alarm->data;



	alarm->data = NULL;

	if (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

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_MODE_ABS);

net/netfilter/xt_IDLETIMER.c

+1 −3
Original line number Diff line number Diff line
@@ -107,14 +107,12 @@ static void idletimer_tg_expired(struct timer_list *t) 
	schedule_work(&timer->work);

}



static enum alarmtimer_restart idletimer_tg_alarmproc(struct alarm *alarm,

							  ktime_t now)

static void idletimer_tg_alarmproc(struct alarm *alarm, ktime_t now)

{

	struct idletimer_tg *timer = alarm->data;



	pr_debug("alarm %s expired\n", timer->attr.attr.name);

	schedule_work(&timer->work);

	return ALARMTIMER_NORESTART;

}



static int idletimer_check_sysfs_name(const char *name, unsigned int size)