From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 3EC993B841D for ; Mon, 10 Aug 2026 10:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786359083; cv=none; b=KuDwEicoDPxvK2JMTZKA8NrEJVETQbHQVBrKLVTaKTyBG6WjEoRbp8H5RCT+HM+zoIzoFUl07iLTt2B1ylsjJgg+9K1/v+bQXYPTPG+PPNyC6pxOfpe+Aehi43B13p5+TeuLD0+NYg2FVZ/ZvqtlZ1SdG0Xwm98m6Mlvrn5SX6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786359083; c=relaxed/simple; bh=YQ61MLDivYrChA93Z1oiQfr3MErrYOCY+tdqp0c0Lf0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PnftqUauplv718D3z/mGYj4BJM0bLU0Hpn941gztxqmMJ8ciTmU7WgmxRvcoAklY9+8AKfQqBy3+y2ISjGhX65ngEkko5/8MQACmMWI2KRVQ2Fc2CaYLvRnmuvuAdJL1CXkZBK6xI5qpk49FZTxho4S0grBgAKdtSatJ0DpXJn8= 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=iBZIlvlP; arc=none smtp.client-ip=209.85.216.48 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="iBZIlvlP" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-38d489b6b71so1471908a91.0 for ; Mon, 10 Aug 2026 03:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786359081; x=1786963881; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=PuJ6x2zkITh7GZS5epmVnODSBm6oxe8knuYTtm1XBZ0=; b=iBZIlvlPVF5xpM/AK9Z8A3szgwbnhlmhTjFiUBDwLHQTy9mlT259INmD5/+G1YKzRC ooN+c4InJRrs+p1tSg4e6qreZRkUIY29u6uvYiezcUKiW8p6HunFBDH/GSjyuPgeROqw eChVnJJ9BernrEUCzjzAW15MjppfpmEmCq+J6YjEzWuXPBVBie9L+io2nRxLvPfitV1N z5KPGL3BNhuFkHxD1efxaF/G2I71g/mQH3e5oLbiTvVFhA0gtv+oYFRsH6lPHAisCtKB PXyl43wA0U98Ey+xZvsvAJn/tibUq6w4F8aKYOxAL1nM5SBG8bCwNqggYZ3y14kk3d8J S5qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786359081; x=1786963881; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PuJ6x2zkITh7GZS5epmVnODSBm6oxe8knuYTtm1XBZ0=; b=tKtCaLBHt+7NOtc+GFqap1nQpVFNyAT6HKq20X1yRxZvQjD2F0WA9WKCSktUSIhaiM 5KM8dtr/tMVtF/bFpShDTQTskUvYbXNnymQgGSXOMsHPiZCMx2ue4vyM6a+bUcakdyWP 0bNZF4i5C6IZnyPWZtHfrswAgPdvbj1l9xAKPl7anYjE9IqhOoFqoBc53SP/E8TevptP TC6a7MIgYVM2l4Smy+4jLl+c3DaEOvjC9mgt8XU4mU3cln6wyN8BLMYT3c/fsZKgNGIQ L2ZMP6yJQu50FSkD1j974wsLWXraoWdtCHhxJKfWvgDgoDm43XRqLgTRPjQTkTeFJP1t 5maA== X-Forwarded-Encrypted: i=1; AHgh+RpfaX0O4a8yNIYP9VMrPCh57YxxxjQIcJI3/JYnfW8havhi4NULLW1E0a60Sz09nFfH9zI205oMYn8AbdQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq+H3tXIsN/yi6vjVE7xp8mH9h/W3HsQIOgBIR7i9RU+IfzDNx MEhwZRSWEtwKOQRcokV/A+WzkN3h3qtE5Aj/qvhdzeuZSVQ8k1CPIuD7 X-Gm-Gg: AR+sD13ggWZ2fpFLKVr0W0MOENH9VJrrSBydzV75DfA7461G/2r6N3TilDKVy6zgAt7 2lFS7XcT7soRknVxkLVb+CITEpGBUHArNTFHUV8fEx9BpeXKzLfb+wsx4MmhMe0jPipU56Cbggj eeo+UYLUC8lvHca2mmDWkVH24m/XNrXsrjp0IDnZP91gvhaj43tPAWD9a97ZciaoRaR2B8j7ujo 7/3wPjRKDuPzlLD2Rql1XLmP5cGKoETk9+eWNShYCC0+X6HQE6LL0W6P+rNecCF41t69kfbPsij ep38AleqXw5A2yifI4pGqXW0FgbBRum/1ajAoRg0FaB3r2cwgnH3OElQYH0FiwFNotd3T8Pi3rX f1m/UiMStz71KfWzXHHyGBePwYEyPAQ/poHaq2Xajg67AGDZ+wr5ovmuDWxHywHgFqLRt9NL1fw LNG8eONp533tIAZaN8l/qsdbE1Nq6DSdSHd2q1jr8yVaEFP2QVxVgnAQIKXYGwuB3vxWTqExD1l 5JG/XxQ49hwvRBD9lOnX/l4lAJFpXpl9moob36Qrokmc2EjdLaehnbUrVf4Ygo5vHpNCnK71uK1 6+KP X-Received: by 2002:a17:90b:2245:b0:38d:dfd1:7c1 with SMTP id 98e67ed59e1d1-3903c542a40mr34920645a91.2.1786359081519; Mon, 10 Aug 2026 03:51:21 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3925fd95c40sm12240771a91.8.2026.08.10.03.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 03:51:21 -0700 (PDT) From: phucduc.bui@gmail.com To: Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH v3] watchdog: qcom: Propagate errors from optional IRQ lookup Date: Mon, 10 Aug 2026 17:51:01 +0700 Message-ID: <20260810105101.55945-1-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc platform_get_irq_optional() returns a positive IRQ number on success or a negative error code on failure. For an optional IRQ, -ENXIO indicates that no IRQ is available, while other errors should be propagated. Instead of only checking for -EPROBE_DEFER, propagate all error codes returned by platform_get_irq_optional() other than -ENXIO, so that failures are properly reported to the caller. Signed-off-by: bui duc phuc --- Link v1 : https://lore.kernel.org/all/20260807081652.38692-1-phucduc.bui@gmail.com/ Changes in v2 : - Update pretimeout handling based on Guenter's review. Link v2 : https://lore.kernel.org/all/20260810102144.51663-1-phucduc.bui@gmail.com/ Changes in v3: - Update the handling of wdt->wdd.info based on Sashiko's review. drivers/watchdog/qcom-wdt.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index 49bd04841f0c..74ac3c507c01 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -287,21 +287,22 @@ static int qcom_wdt_probe(struct platform_device *pdev) return -EINVAL; } + wdt->wdd.info = &qcom_wdt_info; + /* check if there is pretimeout support */ - irq = platform_get_irq_optional(pdev, 0); - if (data->pretimeout && irq > 0) { - ret = devm_request_irq(dev, irq, qcom_wdt_isr, 0, - "wdt_bark", &wdt->wdd); - if (ret) - return ret; + if (data->pretimeout) { + irq = platform_get_irq_optional(pdev, 0); + if (irq < 0 && irq != -ENXIO) + return irq; + if (irq > 0) { + ret = devm_request_irq(dev, irq, qcom_wdt_isr, 0, + "wdt_bark", &wdt->wdd); + if (ret) + return ret; - wdt->wdd.info = &qcom_wdt_pt_info; - wdt->wdd.pretimeout = 1; - } else { - if (irq == -EPROBE_DEFER) - return -EPROBE_DEFER; - - wdt->wdd.info = &qcom_wdt_info; + wdt->wdd.info = &qcom_wdt_pt_info; + wdt->wdd.pretimeout = 1; + } } wdt->wdd.ops = &qcom_wdt_ops; -- 2.43.0