From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 682A9236A73 for ; Thu, 4 Jun 2026 01:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780535165; cv=none; b=T7c7PA9G/7ibdXRSWDNcaB2KvsAwrjS/ULYiDwxUFpS4ttrTC0B/dWKzY4oklx2TSqd1FNDq56pcQyZqC38GDmDgSWovlVDNaLLeP5XveboUDvfGq9VYIbppanBtF8QgRHwmXOIDpaEiQLZ7KxKORvG7aWc8vXJRpsREitSyHzI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780535165; c=relaxed/simple; bh=1BVO5B6F+e++fyfcPkmh/wUWvp5N0OWIqOa+1VW5ETE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vj4cepS/Nmqfy/spoDRBqJcOnWT12iJPDbrMRL7y3HDdCOpMDUOeMP34uEtwz944HaSC9aFjCR04e2WJqeQsIYD8URSCClJpuwDsZVX4oy2KJYNt/3f9VnwXzttpnrB9P7krv2KXbPkd81kTfgiGMXU4W6pAu4ZDfYzFr4hQxJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LPArYICa; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LPArYICa" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-36d9794d82aso62465a91.0 for ; Wed, 03 Jun 2026 18:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780535164; x=1781139964; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n9gEJWImTswB6lvU2PvICsMgm37R+YYrTrc943vxPQA=; b=LPArYICa3memQ4pC5GLZvFvEkmZe/fWt3+hZ9rFVUsxQ1Sag1MFoc+zMN11hxJ49QR zUEm0UjBc94Wp/Ra4CA6xn2JbzBetr7D9hbMDL9kzZlCm1pKLwZkPr6xlSD2p4GDp8t3 YpNRodnrNvZofdjiihP1+/42bAKjPmWdKkKf+1jAPY+IPgcRsPsYghc0h3dzvgY4ZGwO ZF4a7Tix2E3P135SqsyACzXMTvrVQ/8cfOXn+hkvJxWibg1WOu0WsZmzQbYUSOFM8701 kNi4QCI8Z/zSwp34dlmBGAMGJOtQXqES9+QD02xykx7sbLiZSGrujg7VYQ/VWNMlq8Py 4tNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780535164; x=1781139964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=n9gEJWImTswB6lvU2PvICsMgm37R+YYrTrc943vxPQA=; b=TFZ2dts1pPnBGtZc3WTONPdW61soVAsM1g59s0LojXVnXt4ZV5B6J6LXf6G0kYOgwM KTPR/j8dz3OWyp3EE5JUcWiAYcpX5hkBVac+Z4h+R1amB8/MQBeZYeLrwaaPTNluwyY+ N9wZ1aX8P3TxfEK5Vqor0m8tZCGumMadytMCgcmknBpmQwR9sep48m7+0q5FM18Zg2Ms jzl+NtDv6Uc25P/a1jVi++OMNZTszwnZmhgyZx1obBBfFq/MxSLmEz7T3+ayIEaBSLiT E+XKmMC8jnIjgh2nkd1rl5LfuSX3GoEh/bzcxDuEuRUFgdwjmrUwOXcxLxRClMcs22A9 piFg== X-Forwarded-Encrypted: i=1; AFNElJ+h9ckIQG70oJvME10txdEOwmR4KZL8UE8P4aZOqKF0w21re+q7HMl9XW7uxv8p56E49qic/eKavLHw70U=@vger.kernel.org X-Gm-Message-State: AOJu0YwQMnETKFKl9thejgxELQmkuRZlAJ6rnUGl2wItMm8pcCixK/Mv jUhYGQQ+vIE0CH60YD4VRCMe2fGrxBsGsRa9/u7PeaEN3SP0DvVrapCS X-Gm-Gg: Acq92OH6fEyaZIPNVaabboeXnCXTUlE8ryqzO4oqUC87Ttn9Df9FM0PnDtJyLEaBKvi ZSgZ353JmIb7mqoref/rzGiAPbHt+pCIweKo0T3072RsbeecYDAlE7agEYuYYHpImFDrrScErrb rK8q6Nifh7A4l8O2MQLocH83A2WQC/MLRTncD0ZciTR6o0Pm3UJjaD7zgwpTDPvti50HxkDPCI2 OAURVecBwLu2qLWrUz1me9CthlfYCU3vMAzdwu7sJyYEDI3LM+HePn4lWDEkIz5wZ7eo4Stb8ci D9E2Sau8NtQ5bYnUs2M2e3BXquUCpsmceY3N/l1vcLYz/vM5ke6xf5kOl2Jc43pAAaAfayx4Po1 vsRvm2b10jfTdvRtZYcRN9sI1Mug3w1chd5yVqyUN6PIn8cszsedIHpAmwUwzjFHUFzB+jscMFH NLKtffFncYDit29ncu+XmUMuw6aL2gxFjaUc3OU1mZLoCulL8FhZlcdx8aGnEQGqV4o9dCZE/Kq WMrqxv+1ANdWzK4OAPn+rtsRASuhwi6jjfuKtQOcmsCvw== X-Received: by 2002:a17:90b:3b49:b0:35b:9894:f6f9 with SMTP id 98e67ed59e1d1-36e3228676emr5020525a91.18.1780535163699; Wed, 03 Jun 2026 18:06:03 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36e6d169abdsm2366747a91.0.2026.06.03.18.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 18:06:03 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Wim Van Sebroeck , Guenter Roeck , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Microchip (AT91) SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] watchdog: sama5d4: use platform_get_irq_optional() Date: Wed, 3 Jun 2026 18:05:42 -0700 Message-ID: <20260604010542.23177-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260604010542.23177-1-rosenp@gmail.com> References: <20260604010542.23177-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit irq_of_parse_and_map() requires irq_dispose_mapping() on failure. Don't bother with it as platform_get_irq_optional() doesn't need it. Also handle EPROBE_DEFER. Signed-off-by: Rosen Penev --- drivers/watchdog/sama5d4_wdt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index b7a8cfed335d..030029d50257 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -245,7 +244,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) struct watchdog_device *wdd; struct sama5d4_wdt *wdt; void __iomem *regs; - u32 irq = 0; + int irq = 0; u32 reg; int ret; @@ -281,8 +280,11 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) return ret; if (wdt->need_irq) { - irq = irq_of_parse_and_map(dev->of_node, 0); - if (!irq) { + irq = platform_get_irq_optional(pdev, 0); + if (irq == -EPROBE_DEFER) + return irq; + + if (irq < 0) { dev_warn(dev, "failed to get IRQ from DT\n"); wdt->need_irq = false; } -- 2.54.0