From nobody Mon May 25 04:33:50 2026 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 8BAF9155757 for ; Tue, 19 May 2026 00:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779151082; cv=none; b=e9z8lpEtlv0JyQhWZnVUROXUAuDumBn17AysoIdWPP6PdYpJDXuvR+xFkg7MfaO8BF+FmxsxTeVFzOXqXIPfPvexuw+/RNrbiWj27WlWrANa41JQVH/Tdb3o9DXd8cFYpeUenJxFNWA8Ifc+AG3Ndo/jCt0MV8lyb+2eaW7pYvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779151082; c=relaxed/simple; bh=on8OCBOZny6M7srzCxkmP+cPIBVLozeTWdPsPciAkmw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=r82eBO7NNOPv/rdBlj7V4XDRWm4XVukk3+aF3TVOeBfX/ryu91LUv9NGAtNIdBe0FTQ/8iiWG/KDtqSelXMO6yvHRna/6MMJGmh4wjeUplC4s3kG04oHXoadz+HSVnl2Lk7HhottTVDVPwtmxBQzcYYG99nUkTpf2yWjxgizCLM= 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=Yjxngs+U; arc=none smtp.client-ip=209.85.216.42 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="Yjxngs+U" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3697c35eab7so1470145a91.0 for ; Mon, 18 May 2026 17:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779151080; x=1779755880; 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; bh=Djeu0hYBUhuCK4K+K8VSI28sNd7bw2pzRVQ1agobe+g=; b=Yjxngs+Ua1gROMMqfjCsg7q45iHPJywrCjy9kpsafhCtD6LLSWG/tUL1f++XTG/f05 yxHfBCG7o934W8DlICsM8nwzdl6goEW3CPlo0lxqUUPeMvt/Vyi7iEyJwC0OXRtu9e3S z88Y21tSRm12tv6Bi83Rgvw/j/ELY2/2SoeFSVB0Vhjgj+9I0iYMYMQv5FfOqTDv28W1 Qv0feKOL3PGyMcKMPipVL0/tKywrHrGnaCl0GBj9zTgpL3sp/5ujsaXRZZN6ZB5dVfu7 /14SOtoSn6YcWjmNmnjvGg0x2obxeMs8MEDdt6trEruXoS4P2uO2opsKNZ4GYU9pr87W ZQng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779151080; x=1779755880; 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; bh=Djeu0hYBUhuCK4K+K8VSI28sNd7bw2pzRVQ1agobe+g=; b=NtAJhkdRlFt5SCGI/kT2f5WUVOX1HdmdKF5L0GvLWtd8jvhvDgxGgeh9VW9QxQeftd 3E7dcrQY0qS6ZjuuhRUuoHlCEU8RiVM71BSpUpfvaA5HaNgEqg/vbrZZBsLm/i/NNcYT mO/k782ZDP6sCt9JSzQ6H+TDP80SdS1TKc8ErISo6/zuHGtkUdY5t5oYlK51TUafoqH8 B8+eajnSUxZi+pgEq+hnl89moMJ6kEWTpk33aYkOIMv+MNM/clVx7ALEtZOS7BeMyv1c ZnO/AFYyIDCbestzE2zV6Bl/VVqCKO5tVJ3+vSdwHcYYoTe4EJiT3ZeanU/eEx4ljtVp robA== X-Forwarded-Encrypted: i=1; AFNElJ9jk6lO/XC3hdoP/6TZIhSVLzcEqgVgM1Kq+t8d7vW3WMHlpMmWMXMYzmSbE3mvDYKE4w/ti09F3CoIiBo=@vger.kernel.org X-Gm-Message-State: AOJu0YyoToTb6imh+qf6cwYf6xzKxrliFbWpJ8Jyge143eoXpqsaDeCT 40KGbAoUvf6aoFXGL0cZVKDUIivwy2ubYiKebgIYodAKbaEBmSCLqR0l X-Gm-Gg: Acq92OHB9/6tb+JADN/IGPkGW+wmIWc8kvTVNCuvqzQ1W/saQApOVI/O8E0Dg5GhynL bZq851JOuatWoZ3z92lv6SXZtoJnlPdE7aULdzA2ITUjKKKEhXa114yKkPt47vKIK7IQ4YBn58H 8K0YW4sjQGYTCWcFUdxMYKQy7S2lbA0YDR8RbczrM8mzI7g44752Au+aP2v1T5OsTGUK+qtTCW0 BEC9rCr2xKBm5wpQXaTqddx8r8EHrytBCSxe5tNEB4mSAMmoJAWVM/+Cb02bnewetx/XvU2E3/4 IisL0sYu+hX2cnZUqZXz6Pe25pGrQMn8JGHdk6PovF5hHOTNkGKfbycdX2BsI5nR72aoG1jCsVW 59yzbRXqvcuLdLPPQSibSlBqIU4slkIpcPHa2MLR9m9mjVUcP2ZYMuB0T7SF32tLeTPiVCTXkxG xAM1VYXEpPLBIfn1Q4oPssOaMw3U2xDTQOv+JGnIXt9HLywxaL+RUGQES1CSImjwlXOk4hVjxeA zZJanvvaxiy0TtAYd+g3A1aSIv5bhxvlBo= X-Received: by 2002:a17:902:b409:b0:2b7:975c:dacc with SMTP id d9443c01a7336-2bd7e8037f7mr131633455ad.1.1779151079906; Mon, 18 May 2026 17:37:59 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5c2631basm159848935ad.34.2026.05.18.17.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 17:37:59 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] watchdog: orion: Use of_device_get_match_data() Date: Mon, 18 May 2026 17:37:42 -0700 Message-ID: <20260519003742.626477-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use of_device_get_match_data() to fetch watchdog match data directly instead of open-coding an of_match_device() lookup. Keep the existing legacy fallback when no match data is available. This also lets the driver drop the of_device.h include. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- drivers/watchdog/orion_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 0e145f762f6f..a92701ff2653 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -21,7 +21,6 @@ #include #include #include -#include /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */ #define ORION_RSTOUT_MASK_OFFSET 0x20108 @@ -554,7 +553,6 @@ static int orion_wdt_get_regs(struct platform_device *p= dev, static int orion_wdt_probe(struct platform_device *pdev) { struct orion_watchdog *dev; - const struct of_device_id *match; unsigned int wdt_max_duration; /* (seconds) */ int ret, irq; @@ -563,15 +561,14 @@ static int orion_wdt_probe(struct platform_device *pd= ev) if (!dev) return -ENOMEM; - match =3D of_match_device(orion_wdt_of_match_table, &pdev->dev); - if (!match) + dev->data =3D of_device_get_match_data(&pdev->dev); + if (!dev->data) /* Default legacy match */ - match =3D &orion_wdt_of_match_table[0]; + dev->data =3D orion_wdt_of_match_table[0].data; dev->wdt.info =3D &orion_wdt_info; dev->wdt.ops =3D &orion_wdt_ops; dev->wdt.min_timeout =3D 1; - dev->data =3D match->data; ret =3D orion_wdt_get_regs(pdev, dev); if (ret) -- 2.54.0