Received: by 2002:ab2:1347:0:b0:1f4:ac9d:b246 with SMTP id g7csp72706lqg; Wed, 10 Apr 2024 16:07:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX2XlnCjrs8h91cbJVOiOC1XjBOIVErsA3zhgOA61hzON+UCPzL/CwYyzY1oVl0LFF1EORDTxiIM9YPfDvVNuhWb8v7/7E4YnOuGXxkSw== X-Google-Smtp-Source: AGHT+IEpqrhvHc2UfmFUoQuYjWRa7EWDNeekl3f1lcf6fbT1eQfV/1ZMVrJTUE8IcQgWrllG0JWG X-Received: by 2002:a17:906:37c7:b0:a4d:f8d7:8546 with SMTP id o7-20020a17090637c700b00a4df8d78546mr683938ejc.7.1712790476281; Wed, 10 Apr 2024 16:07:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712790476; cv=pass; d=google.com; s=arc-20160816; b=so6F/Pa7+mt6oKVi4Vc/826AbF7XnlN/WQddeqb332y67ATnrwWYD0cC+78pIxMt02 iDIcuffMCcJTJl/mXG3Oy+SQ0tCJPZMsZaApZUBYaiN1Igg1DeNdKXuSYCqSej6PcBMi yCX7F3a2BpnURuBEOX6XkfuN4lXL3mFr+5ne+NHPkWZMIcehD93rMlTAH0PufdV74tRR EE3izKY29FoW//sxJqWxTIjO6PFzy7Zd8axIcRBDNCOsv0DpiqOtChBnMuofSD1RDQsr M6+pGQcozHK+8yobHFVGefDZxjAkNpLn82UnpnX6e1FAZDSOP0yHqLEl3jbF+9vABpqB p/MQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:subject:cc:to:from:dkim-signature :dkim-signature:message-id; bh=a/VQUBOvvL1gBabTFPPMD8zLuxnFJjH7wVLI37j0UKo=; fh=joBs/8L+orz77ylyCy6wqNwwi35f7sYhLR+/TQjQjhI=; b=genyVQJlG8sGu7bUV33anYzZ7vbfgSU8uIHUZigVlCzTqG+Hw1k4XsXnRZr2Cr7mbP X8zx8d0Aiy1Ci/nLKAQLKzH9eaEzR18G2RCIKhopg4MPzI5Rt6hQhkVBBru7GnSquT1t Vdnq7HL8fthK9iJt2N6gfzWhcj6UpcvZUe7Uxi/zo2PE2IjncquAw4SMLEfy3zCnLsU7 XkYnWu1d9msmOvfgOueD8rJgIWPYxRLOGwtgZTHUbxx8a+aVeMkMAblM47vWTIyi7Oft 0/pNGDKBJIBMGSYb1Q5AySVqTQ9qLPcZ4P7BjJp+gmmUzbrdmKkcF7LuI5DT2iF95TiN Le7w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QFULevm3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-139504-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-139504-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id bq2-20020a170906d0c200b00a51a11372a2si108856ejb.301.2024.04.10.16.07.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 16:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-139504-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QFULevm3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-139504-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-139504-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A15501F2A6E8 for ; Wed, 10 Apr 2024 22:58:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8BF55137C4B; Wed, 10 Apr 2024 22:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QFULevm3"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aziXDweo" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4BA4137929 for ; Wed, 10 Apr 2024 22:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712789264; cv=none; b=pyIagEYED+KK9wgrcbFlI3gwON0ApV66hfncY+7t9d7/VCpu5CzFKa5hf1aAhO/yXo8pbm5+awkhV+iXkhfisyBlKWKibGMBXsdQ9I4BFYo6qfEP9BBpoZsxCJ3YBVk/7rrlXAICFCqdhf9IidOJK+Py5dSZWjlACb3DEAVT10Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712789264; c=relaxed/simple; bh=VFiMQKyOoL+mDJlBq/h+g4Nftt1Jj5QgaCKxsBJg4zs=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=TTrZSsoZxjf60oACRgqfTw/fGRwzVg6+ckJiDQ0QTthau2KyISehLDdyMeLLWWExwuiZ5ZUe+xzb50y4/hlj7xeYBpok6CjsLTIDEwF75JCYNR3UnNOYmfldPdWQ697WARNw/8J/yvFXQafGT+nZ5cpugQ6MSXdETOJvCBls97s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QFULevm3; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=aziXDweo; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Message-ID: <20240410165554.066922956@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1712789260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=a/VQUBOvvL1gBabTFPPMD8zLuxnFJjH7wVLI37j0UKo=; b=QFULevm3pNPVq4sPFoNtlQtIfeIT5kELxrpiIbqmHIBtAuuNDoguX9N/kW1E/j7+QpmJ5I 3xbeEQqy2Is44x8XoJFCOsfd4vIib4NL8oc3lSM1wl80p8F/hELozUhtzZoFAa7cek4oJ9 GihByQS7S83cZy6S6J9sQ9KKFFcQSA4FWmOeAugr1RUTY1m2K57Z91US1gXhxCs3cjryzZ xAqhgh8S5x1jiDmbuXwdNq9URVmiUWMahkoKA15PQuuQydwE1Ej6wrwTv4GrSdH2suyqAX 6YZGbJ6p+gRQ5r2a1d+vHtCQzggsbxCoCCUiokSUorZw9vDtNQz054Qe8vRMKQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1712789260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=a/VQUBOvvL1gBabTFPPMD8zLuxnFJjH7wVLI37j0UKo=; b=aziXDweoIOwMqaw0tWIwt++4bi5PYaXdweiclWXHrTRfFb483DbfoOltmPOKNjmlaq+msJ m2+eZ5dSBlWyvMAg== From: Thomas Gleixner To: LKML Cc: Anna-Maria Behnsen , Frederic Weisbecker , John Stultz , Peter Zijlstra , Ingo Molnar , Stephen Boyd , Eric Biederman , Oleg Nesterov Subject: [patch V2 50/50] alarmtimers: Remove return value from alarm functions References: <20240410164558.316665885@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Thu, 11 Apr 2024 00:47:40 +0200 (CEST) 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 --- drivers/power/supply/charger-manager.c | 3 +-- fs/timerfd.c | 4 +--- include/linux/alarmtimer.h | 10 ++-------- kernel/time/alarmtimer.c | 16 +++++----------- net/netfilter/xt_IDLETIMER.c | 4 +--- 5 files changed, 10 insertions(+), 27 deletions(-) --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1412,10 +1412,9 @@ static inline struct charger_desc *cm_ge 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) --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -79,13 +79,11 @@ static enum hrtimer_restart timerfd_tmrp 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; } /* --- a/include/linux/alarmtimer.h +++ b/include/linux/alarmtimer.h @@ -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); --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -323,7 +323,7 @@ static int alarmtimer_resume(struct devi 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; @@ -339,7 +339,7 @@ static void * @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); @@ -532,7 +532,7 @@ static enum alarmtimer_type clock2alarm( * * 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); unsigned long flags; @@ -540,8 +540,6 @@ static enum alarmtimer_restart alarm_han spin_lock_irqsave(&ptr->it_lock, flags); posix_timer_queue_signal(ptr); spin_unlock_irqrestore(&ptr->it_lock, flags); - - return ALARMTIMER_NORESTART; } /** @@ -702,18 +700,14 @@ static int alarm_timer_create(struct k_i * @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; } /** @@ -765,7 +759,7 @@ static int alarmtimer_do_nsleep(struct a 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); --- a/net/netfilter/xt_IDLETIMER.c +++ b/net/netfilter/xt_IDLETIMER.c @@ -107,14 +107,12 @@ static void idletimer_tg_expired(struct 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)