[tip: timers/core] alarmtimer: Return early if platform_device_register_data() fails

From: tip-bot2 for Thomas Weißschuh

Date: Mon Nov 09 2026 - 14:57:17 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: 4ed8ae10367e88a974582027494ce4a197c5b175
Gitweb: https://git.kernel.org/tip/4ed8ae10367e88a974582027494ce4a197c5b175
Author: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
AuthorDate: Mon, 02 Nov 2026 06:11:55
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Mon, 09 Nov 2026 20:50:03 +01:00

alarmtimer: Return early if platform_device_register_data() fails

Simplify the logic by returning on error instead of having to handle the
potential error in each following operation.

Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20261102-alarmtimer-locking-v1-2-3c79a698aeae@xxxxxxxxxxxxxx
---
kernel/time/alarmtimer.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 601ebdc..8eeea09 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -89,10 +89,12 @@ static int alarmtimer_rtc_add_device(struct device *dev)

pdev = platform_device_register_data(dev, "alarmtimer",
PLATFORM_DEVID_AUTO, NULL, 0);
- if (!IS_ERR(pdev))
- device_init_wakeup(&pdev->dev, true);
+ if (IS_ERR(pdev))
+ return PTR_ERR(pdev);

- if (!IS_ERR(pdev) && try_module_get(rtc->owner)) {
+ device_init_wakeup(&pdev->dev, true);
+
+ if (try_module_get(rtc->owner)) {
WRITE_ONCE(rtcdev, rtc);
/* hold a reference so it doesn't go away */
get_device(dev);