From nobody Fri Apr 17 06:15:35 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 3DB2D361DB1 for ; Mon, 23 Feb 2026 11:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771847966; cv=none; b=INyk2DwnKDFUDSw1kXD74wsaxE7IP4l437P9DdozAl9VvbInIGOb4UCGamoXdjJ3OKQDKNlDglgv0iD00ogFkrMF0Jt5zGEdUD+drcuhzrLEa/0206v1Pwn3L9txbdWKWY2MVTwYWKQ0e3BiA6TIyh3B04aBfgRTXtFHs9rdIdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771847966; c=relaxed/simple; bh=SzD9Iaa5T3Eo/a0uF31MTvQLnlT9Ly7wKbfUGpbTGO4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=BriXGffy22QtHuFTfIhbL0fPu5FYiZ3+WuOU/GwBJr/fwr2zLkE8mfiP3q5oprErNIkSN0BbzgavDNPgQIFvmLD7NS2r52t2gMUgzBtkiYYMjUxCNQK0KWLB29fFdbBcwIMCkda2IQkK84DyJF52Ir8GyEwfwSk8onEEjCXTyN4= 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=kpiJRUCb; arc=none smtp.client-ip=209.85.210.178 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="kpiJRUCb" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-8220bd582ddso1838060b3a.2 for ; Mon, 23 Feb 2026 03:59:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771847964; x=1772452764; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=bZ3Uv4dBfKrGypQF2iUd8rVEcAKA1IuNWDJE7r42I1Q=; b=kpiJRUCbVB42l2FHchQ/A9DfNI0BsNBNR5RHiNjouJfI4iz7iMX33grFzKwmb7BDcH wgYmTJi6ETuWLo0KWIdAKqT6P1CaCZP/UrS6G/f/CH8t65JDI8tH8SnTlM2suePIPMqL R+8tSQB6x5qAUuY8Wf0hXdqx4AIhsb1952X94GLl2qh9yWrIzgB3B8emHlMXSHsBVLX8 +6guMxqyy5ViHdCIs7eNCIdwvu+etS1CFXZCEJjVay/BI3UmhC+pu/goYfYllvCLz9da RdgIrlAJMGlac4t0oeNqreOoT9+mt10QDk/zqIg0r0qYjRpRn1sV+nzcNcPS90i7XUCM tKOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771847964; x=1772452764; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bZ3Uv4dBfKrGypQF2iUd8rVEcAKA1IuNWDJE7r42I1Q=; b=u+oy1XsURtg8b4rFbsc3VBODUP4eKPKo8sK852Xe8B58nftkNBIMmLqmJbf4IPiSTv l3PmRcL0jRcrTIg/nzbxOP07ogbzC6e+GSP/rq9LpV/t9LBA24D5BKpC/4frZGG45+cC mmZgPdlZfqx6TstoecZ5fwMggMcUqWlfEo0jQbpUGdhaqZtVNkN38rQ+UGOprPOEwytb ng6V5Eyj8EtPcCebXnXmErrlFUccgeRx1ZqnHMOdgN7vy7VGtheregZ2EWdkdB0j1/R6 /+TlMIftEgtAiW7T4VDxLC8yekUuhsP2Il6ywtauvwt6gs0vv7yaMGcq6hkBVv41xnPm zCmA== X-Forwarded-Encrypted: i=1; AJvYcCWqvsXmB69QpQtU64dUBZfuDsCiMFQ5n7JlsjT5JfUl/IvWqBo1mvw6jYxGgQ1EvhBvjSK+dvTvLKrFkCw=@vger.kernel.org X-Gm-Message-State: AOJu0YziTbGy4VCR/7xiNNgL7I8AlbVJ1bRLeWJxgAht2tYbREmwqWr9 sXk+aJuCBuJW2NbFY9E6LvmUQ0RfzykllDsTnU9a6RriUV2M/I20bj+w X-Gm-Gg: AZuq6aIIR7KkPL+VjHNJ+DsAdNs1Z5efQws5vdkAMyfi22nSx8jku5tpdPdC4AdMKM1 DV5fE8fjLgS5wc4/QVw0tHNkTvHKsUtxKu/MBqgBQY1d9Bo2gr6UQs7VZfSqrT8tkYurrgZ3ezX qZeDGe5enK4w8N+UHrMCeWEs9ezMwmruSkecSEjQdBQBsJIOAZ3nJGFA/z5LJUk1IVj8Dnxt2Pv q4W2TT766Kuyig0ua0896/uNMD/LNnV0A+TB0IXKZsfaDnnNAeH3ZkMDhizUVhJgguVOkNYHA7H dbViPEHXRkBNzO04M+bOfSPkhgr960scZ6Q0PhAVuvCXQGM0QSA6UuxLtRtlxu7sQI90ghEqgv+ c8w9+mYGZ2fx/QGkJ/kI8rsIj23EzSshtyqZXarhjjzBcccnXCQTOm27lquZinPQuFQFyTkLTRG Y/C/N3U011ATyv8Vy8by1VJMPa4a83EK3uGChRhg== X-Received: by 2002:a05:6a00:ab03:b0:824:9451:c1e1 with SMTP id d2e1a72fcca58-826daa82eeemr6723768b3a.58.1771847964413; Mon, 23 Feb 2026 03:59:24 -0800 (PST) Received: from junjungu-PC.localdomain ([2408:820c:9008:ba52:1cfe:ae34:fdd6:6b97]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd641040sm7261616b3a.10.2026.02.23.03.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 03:59:24 -0800 (PST) From: Felix Gu Date: Mon, 23 Feb 2026 19:59:20 +0800 Subject: [PATCH] watchdog: sprd_wdt: Remove redundant sprd_wdt_disable() on register failure 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" Content-Transfer-Encoding: quoted-printable Message-Id: <20260223-sprd_wdt-v1-1-2e71f9a76ecb@gmail.com> X-B4-Tracking: v=1; b=H4sIABdBnGkC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDIyNj3eKCopT48pQSXeNU89Rkc0ML8zRjAyWg8oKi1LTMCrBR0bG1tQB ZYgweWgAAAA== X-Change-ID: 20260223-sprd_wdt-3e7ec7187f30 To: Wim Van Sebroeck , Guenter Roeck , Orson Zhai , Baolin Wang , Chunyan Zhang Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1771847961; l=1230; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=SzD9Iaa5T3Eo/a0uF31MTvQLnlT9Ly7wKbfUGpbTGO4=; b=xEJkwp9hPUX9493/u6Pu+C/xw3zAGIisitj4cjWmQ/EMJRg/UjPNFnetNPrndVm3+lI70/lsC BTD6AifmAkaAth+pFDAhOb1t0dLmvlSUF9GdGla1sT/nbDyQW8/itei X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= The driver uses devm_add_action_or_reset() to register sprd_wdt_disable() as a managed cleanup action. When devm_watchdog_register_device() fails, the devm core will invoke the cleanup action automatically. The explicit sprd_wdt_disable() call in the error path is therefore redundant and results in adouble cleanup. Fixes: 78d9bfad2e89 ("watchdog: sprd_wdt: Convert to use device managed fun= ctions and other improvements") Signed-off-by: Felix Gu Reviewed-by: Baolin Wang Reviewed-by: Guenter Roeck --- drivers/watchdog/sprd_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c index 4e689b6ff141..aacf04616fef 100644 --- a/drivers/watchdog/sprd_wdt.c +++ b/drivers/watchdog/sprd_wdt.c @@ -320,10 +320,9 @@ static int sprd_wdt_probe(struct platform_device *pdev) watchdog_init_timeout(&wdt->wdd, 0, dev); =20 ret =3D devm_watchdog_register_device(dev, &wdt->wdd); - if (ret) { - sprd_wdt_disable(wdt); + if (ret) return ret; - } + platform_set_drvdata(pdev, wdt); =20 return 0; --- base-commit: d4906ae14a5f136ceb671bb14cedbf13fa560da6 change-id: 20260223-sprd_wdt-3e7ec7187f30 Best regards, --=20 Felix Gu