From nobody Sat Jun 13 23:06:28 2026 Received: from mail.avm.de (mail.avm.de [212.42.244.120]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5165819B5B1; Tue, 5 May 2026 09:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; cv=none; b=SvsNUbSWVvOoonRMRU+YpkpsHegOg9rD3mh3DQ5K90XW8m+24/OnfQ4hRLS0QPro4FDFdlVC3qpRMG6FnBHqn5Cq4F1UYUQ8NMonEF8PFxSQTm9nm4ZGuL7lZUZtwNUpVJcwusQcRc4EybdDMWgP8lk8gNW7v2sn8qC3eFV3ipo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; c=relaxed/simple; bh=R/q6aYtyjcn/R9tkiLEtiY8Wq2ifImCddQQVrHnTSgw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OmgMJTA/6+kZ5ZGViUUKGgtC1HnbUVrjPfwZ0d7qUcEnCQ7+UGY/P2C0Uu7xO/jFzp4TfRys/SPSoE1JiA7rquTq54hfPm01KrUZoVQCmgdmsZOA4mbqUhj6orP4thOFxGmRRQUEiPh3g6pAsEp2s12IJxvEoZmX/YfDG0ZDDTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de; spf=pass smtp.mailfrom=avm.de; arc=none smtp.client-ip=212.42.244.120 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=avm.de Received: from [212.42.244.71] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.56.1) (envelope-from ) id 69f9b7cf-839b-7f0000032729-7f000001e384-1 for ; Tue, 05 May 2026 11:26:39 +0200 Received: from mail-auth.avm.de (dovecot-mx-01.avm.de [212.42.244.71]) by mail.avm.de (Postfix) with ESMTPS; Tue, 5 May 2026 11:26:39 +0200 (CEST) From: Philipp Hahn To: Wim Van Sebroeck , Guenter Roeck Cc: Philipp Hahn , linux-watchdog@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/5] watchdog: Change suffix .txt to .rst in references Date: Tue, 5 May 2026 11:26:12 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: FRITZ! Technology GmbH, Berlin, Germany Content-Transfer-Encoding: quoted-printable X-purgate-ID: 149429::1777973199-D4707EA9-7356F148/0/0 X-purgate-type: clean X-purgate-size: 1767 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Content-Type: text/plain; charset="utf-8" From: Philipp Hahn Fix link to documentation, which has already been converted to reST. Also remove apostrophes which are no longer needed. Signed-off-by: Philipp Hahn --- Documentation/watchdog/convert_drivers_to_kernel_api.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.rst b/Doc= umentation/watchdog/convert_drivers_to_kernel_api.rst index e83609a5d0071..9eddb962f8e4c 100644 --- a/Documentation/watchdog/convert_drivers_to_kernel_api.rst +++ b/Documentation/watchdog/convert_drivers_to_kernel_api.rst @@ -114,7 +114,7 @@ Add the watchdog operations --------------------------- =20 All possible callbacks are defined in 'struct watchdog_ops'. You can find = it -explained in 'watchdog-kernel-api.txt' in this directory. start() and +explained in watchdog-kernel-api.rst in this directory. start() and owner must be set, the rest are optional. You will easily find correspondi= ng functions in the old driver. Note that you will now get a pointer to the watchdog_device as a parameter to these functions, so you probably have to @@ -153,7 +153,7 @@ Add the watchdog device =20 Now we need to create a 'struct watchdog_device' and populate it with the necessary information for the framework. The struct is also explained in d= etail -in 'watchdog-kernel-api.txt' in this directory. We pass it the mandatory +in watchdog-kernel-api.rst in this directory. We pass it the mandatory watchdog_info struct and the newly created watchdog_ops. Often, old drivers have their own record-keeping for things like bootstatus and timeout using static variables. Those have to be converted to use the members in --=20 2.43.0 From nobody Sat Jun 13 23:06:28 2026 Received: from mail.avm.de (mail.avm.de [212.42.244.94]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52C1E32860B; Tue, 5 May 2026 09:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.94 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; cv=none; b=T7Y/Fh85rvKNnk8eDCu5jNUIU1RDZWQlNko2Lh9Ra/U3j2RwQK3K8n6OB5tqvsSRsaZW9f56FzPFTbX4pCASlZF+f8+2FxQXcQaHHpSpPVJ/n98qcuSLh1Ky4AYwqvBFpQGp9e782N0mRGbsbiIPWPh8UK45uqRcPDzFjVnRbbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; c=relaxed/simple; bh=ttX60hNNc0JOKvmlZKq7C+/hMW4CwXG+bLrbojIUd7U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RDGJV6nOuyoGpC2Cb6XwFqaoGe0cPd0C1ufesQtFjuFPVdDuoJFYOTnC3tlvCTNT2XsKxj98JCL691ADfkP91pl2E6oCPZgvVLYg67u8Nnk4SuDbpDRr+cQHneBg1ac1cwTV9F8KLkhfoW++pkV19sXDzpyB2smhqiBszfWoEx8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de; spf=pass smtp.mailfrom=avm.de; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b=nfkFDEUf; arc=none smtp.client-ip=212.42.244.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=avm.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b="nfkFDEUf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1777973200; bh=ttX60hNNc0JOKvmlZKq7C+/hMW4CwXG+bLrbojIUd7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nfkFDEUf+sWhJ5ZgsSteKzTmgnV03e9zBLaj2NEjMQeFPzwOMooZsjiSVhENU6WJ1 TBBnu7Aj/h5B04CoveSKE38NgrF0fLWBst+TLlZLMREp9g1ans/7Zy2O0UGS+0cIzh +5kx+3DpHrIr18wdUeV5OugFj8Fex7eMqQJ/Pneg= Received: from [2001:bf0:244:244::71] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.56.1) (envelope-from ) id 69f9b7d0-23fc-7f0000032729-7f000001b352-1 for ; Tue, 05 May 2026 11:26:40 +0200 Received: from mail-auth.avm.de (dovecot-mx-01.avm.de [IPv6:2001:bf0:244:244::71]) by mail.avm.de (Postfix) with ESMTPS; Tue, 5 May 2026 11:26:40 +0200 (CEST) From: Philipp Hahn To: Wim Van Sebroeck , Guenter Roeck Cc: Philipp Hahn , linux-watchdog@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] watchdog: Move `struct` before name Date: Tue, 5 May 2026 11:26:13 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: FRITZ! Technology GmbH, Berlin, Germany Content-Transfer-Encoding: quoted-printable X-purgate-ID: 149429::1777973200-A947AEEC-CE429B98/0/0 X-purgate-type: clean X-purgate-size: 5888 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Content-Type: text/plain; charset="utf-8" From: Philipp Hahn Write `struct ` before the structure name as Sphinx otherwise uses the following word after it. See https://docs.kernel.org/watchdog/watchdog-api.html#environmental-monitoring Signed-off-by: Philipp Hahn --- .../convert_drivers_to_kernel_api.rst | 24 +++++++++---------- Documentation/watchdog/watchdog-api.rst | 2 +- .../watchdog/watchdog-kernel-api.rst | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.rst b/Doc= umentation/watchdog/convert_drivers_to_kernel_api.rst index 9eddb962f8e4c..004fe6ef76e94 100644 --- a/Documentation/watchdog/convert_drivers_to_kernel_api.rst +++ b/Documentation/watchdog/convert_drivers_to_kernel_api.rst @@ -11,12 +11,12 @@ This document shall guide you for this task. The necess= ary steps are described as well as things to look out for. =20 =20 -Remove the file_operations struct +Remove the struct file_operations --------------------------------- =20 Old drivers define their own file_operations for actions like open(), writ= e(), etc... These are now handled by the framework and just call the driver when -needed. So, in general, the 'file_operations' struct and assorted function= s can +needed. So, in general, the struct file_operations and assorted functions = can go. Only very few driver-specific details have to be moved to other functi= ons. Here is a overview of the functions and probably needed actions: =20 @@ -36,7 +36,7 @@ Here is a overview of the functions and probably needed a= ctions: from the driver: =20 WDIOC_GETSUPPORT: - Returns the mandatory watchdog_info struct from the driver + Returns the mandatory struct watchdog_info from the driver =20 WDIOC_GETSTATUS: Needs the status-callback defined, otherwise returns 0 @@ -88,8 +88,8 @@ refactoring. The rest can go. Remove the miscdevice --------------------- =20 -Since the file_operations are gone now, you can also remove the 'struct -miscdevice'. The framework will create it on watchdog_dev_register() calle= d by +Since the file_operations are gone now, you can also remove the struct +miscdevice. The framework will create it on watchdog_dev_register() called= by watchdog_register_device():: =20 -static struct miscdevice s3c2410wdt_miscdev =3D { @@ -113,10 +113,10 @@ them. Includes can be removed, too. For example:: Add the watchdog operations --------------------------- =20 -All possible callbacks are defined in 'struct watchdog_ops'. You can find = it +All possible callbacks are defined in struct watchdog_ops. You can find it explained in watchdog-kernel-api.rst in this directory. start() and owner must be set, the rest are optional. You will easily find correspondi= ng -functions in the old driver. Note that you will now get a pointer to the +functions in the old driver. Note that you will now get a pointer to the s= truct watchdog_device as a parameter to these functions, so you probably have to change the function header. Other changes are most likely not needed, beca= use here simply happens the direct hardware access. If you have device-specific @@ -151,12 +151,12 @@ A typical function-header change looks like:: Add the watchdog device ----------------------- =20 -Now we need to create a 'struct watchdog_device' and populate it with the -necessary information for the framework. The struct is also explained in d= etail +Now we need to create a struct watchdog_device and populate it with the +necessary information for the framework. The structure is also explained i= n detail in watchdog-kernel-api.rst in this directory. We pass it the mandatory -watchdog_info struct and the newly created watchdog_ops. Often, old drivers +struct watchdog_info and the newly created struct watchdog_ops. Often, old= drivers have their own record-keeping for things like bootstatus and timeout using -static variables. Those have to be converted to use the members in +static variables. Those have to be converted to use the members in struct watchdog_device. Note that the timeout values are unsigned int. Some drive= rs use signed int, so this has to be converted, too. =20 @@ -174,7 +174,7 @@ Handle the 'nowayout' feature A few drivers use nowayout statically, i.e. there is no module parameter f= or it and only CONFIG_WATCHDOG_NOWAYOUT determines if the feature is going to be used. This needs to be converted by initializing the status variable of the -watchdog_device like this:: +struct watchdog_device like this:: =20 .status =3D WATCHDOG_NOWAYOUT_INIT_STATUS, =20 diff --git a/Documentation/watchdog/watchdog-api.rst b/Documentation/watchd= og/watchdog-api.rst index 78e228c272cf8..2c138eaa43397 100644 --- a/Documentation/watchdog/watchdog-api.rst +++ b/Documentation/watchdog/watchdog-api.rst @@ -158,7 +158,7 @@ available to ask what the device can do:: struct watchdog_info ident; ioctl(fd, WDIOC_GETSUPPORT, &ident); =20 -the fields returned in the ident struct are: +the fields returned in the struct watchdog_info are: =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D identity a string identifying the watchdog driver diff --git a/Documentation/watchdog/watchdog-kernel-api.rst b/Documentation= /watchdog/watchdog-kernel-api.rst index 5649c54cf6fbe..e2c1386c95509 100644 --- a/Documentation/watchdog/watchdog-kernel-api.rst +++ b/Documentation/watchdog/watchdog-kernel-api.rst @@ -257,7 +257,7 @@ bit-operations. The status bits that are defined are: To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog timer device) you can either: =20 - * set it statically in your watchdog_device struct with + * set it statically in your struct watchdog_device with =20 .status =3D WATCHDOG_NOWAYOUT_INIT_STATUS, =20 --=20 2.43.0 From nobody Sat Jun 13 23:06:28 2026 Received: from mail.avm.de (mail.avm.de [212.42.244.94]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 742173264F1; Tue, 5 May 2026 09:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.94 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973207; cv=none; b=hI41/9fvL6oaxmm1XLY1yY6bNbV8XRCm++OPVjAyqVqDXFyv6EdH+Y7SujahrnYAJm+SoD2K+9lqBRK4SWxSVh/moI30v0/ax+PeHQoAQ79cCwfsGUC7i/OwIrMtdfnctpw2ccpqxVKL0rOJaDs+5wHk+C//fsuPrDCUkwqvXac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973207; c=relaxed/simple; bh=jMj3wMk9KiHUQnn60IoB3KkmCvFOVdxij1Ncga2+HQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pfYXvojT7kANq9TmnrwF8To6xwYoIYjSBSIw0ogV+7epDhZKILMP8A3rkuwwL5vjnr4rqcy1Q5YpH/RA1kB/C5KJ1PvlcgTxfx2e5Vb0j8KeaKdNsT2aJBg7GZOwD/Wt78yqZV/vXmcVd5aA/gPsYxUrK5J2uCVvETGR1GNsP/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de; spf=pass smtp.mailfrom=avm.de; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b=hmLypVZ6; arc=none smtp.client-ip=212.42.244.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=avm.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b="hmLypVZ6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1777973200; bh=jMj3wMk9KiHUQnn60IoB3KkmCvFOVdxij1Ncga2+HQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hmLypVZ6D+mLkdhQvHcxtHjKMdvHBK2M+hm6j1RDKbSPUOQbwaIxsUQm+1kpoI0hK 9nZmym3ZCfLwnKyrwVifFBCjMt1OwMLLHaNz5T8d0NPhLHpWi9KrJt34AFDrudehLP Xfmtm9OLTEqsX0CMDOuDyL0tUxe8mbfVoIXJ+9Ic= Received: from [212.42.244.71] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.56.1) (envelope-from ) id 69f9b7d0-23fc-7f0000032729-7f000001b35c-1 for ; Tue, 05 May 2026 11:26:40 +0200 Received: from mail-auth.avm.de (dovecot-mx-01.avm.de [212.42.244.71]) by mail.avm.de (Postfix) with ESMTPS; Tue, 5 May 2026 11:26:40 +0200 (CEST) From: Philipp Hahn To: Wim Van Sebroeck , Guenter Roeck Cc: Philipp Hahn , linux-watchdog@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/5] watchdog: Replace intermixed tab/space indent Date: Tue, 5 May 2026 11:26:14 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: FRITZ! Technology GmbH, Berlin, Germany Content-Transfer-Encoding: quoted-printable X-purgate-ID: 149429::1777973200-5D65EEEC-444AF52B/0/0 X-purgate-type: clean X-purgate-size: 1017 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Content-Type: text/plain; charset="utf-8" From: Philipp Hahn Consistently indent all lines with tabs instead of having one line using blanks. Signed-off-by: Philipp Hahn --- Documentation/watchdog/watchdog-api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/watchdog/watchdog-api.rst b/Documentation/watchd= og/watchdog-api.rst index 2c138eaa43397..78d0940155b13 100644 --- a/Documentation/watchdog/watchdog-api.rst +++ b/Documentation/watchdog/watchdog-api.rst @@ -161,7 +161,7 @@ available to ask what the device can do:: the fields returned in the struct watchdog_info are: =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - identity a string identifying the watchdog driver + identity a string identifying the watchdog driver firmware_version the firmware version of the card if available options a flags describing what the device supports =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.43.0 From nobody Sat Jun 13 23:06:28 2026 Received: from mail.avm.de (mail.avm.de [212.42.244.119]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F350328610; Tue, 5 May 2026 09:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.119 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; cv=none; b=W2u1xMg/ym2U+bChmv9t+4zvQya2dG8Klsa/P6TGtkkEJPT7pXK8TqIFeAhZfMNVpKN1hf1n/58yo0WJWMO4QT2003lusHisUX2/prBD/K0IAlw8wJgZYjiQfHe/2VhN+o2hQvnqf1bJDYZYSgWnPcLGttqhO8rKJrHnJRSdUSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; c=relaxed/simple; bh=on5RSa3EvZp85/dED2BvXFuR/vPUMaxvQXxG7Jh74Ag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EXK/TD2CFXOqq6Ss069bg2rlanCE1gwNMKipFBjSL6jE8bH3h8mddunk0+kkwPvIJSyyPz+OZddxM4XoY+Zl2m6PIAl+ZAvtui1ILm0XXTPmudIV8p9uzKu+t3f9sgJm5eAvuZ7u81bJz7907E96NFpNR7FpS9QS1Qr0kRAEqNs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de; spf=pass smtp.mailfrom=avm.de; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b=feKYQx0S; arc=none smtp.client-ip=212.42.244.119 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=avm.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b="feKYQx0S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1777973200; bh=on5RSa3EvZp85/dED2BvXFuR/vPUMaxvQXxG7Jh74Ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=feKYQx0Sy5h5aBHTMg7p4yVIaOpblcsnF2SaQbKEpZnQb/vG/XtiUEdYxHHj/MUa0 0pDKJ9VTTe7OuvtkpwQjo0H9gkKcMaU4nK4hm3DplKyYUVpWzGP3chLv6+Hq723Bc1 NO/6aUCLGfRG3Clg1G4AHiC5XTL3u0T2HWLJUQLc= Received: from [2001:bf0:244:244::71] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.56.1) (envelope-from ) id 69f9b7d0-88c8-7f0000032729-7f0000019244-1 for ; Tue, 05 May 2026 11:26:40 +0200 Received: from mail-auth.avm.de (dovecot-mx-01.avm.de [IPv6:2001:bf0:244:244::71]) by mail.avm.de (Postfix) with ESMTPS; Tue, 5 May 2026 11:26:40 +0200 (CEST) From: Philipp Hahn To: Wim Van Sebroeck , Guenter Roeck Cc: Philipp Hahn , linux-watchdog@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] watchdog: Separate kind of documentation Date: Tue, 5 May 2026 11:26:15 +0200 Message-ID: <7d1b722205bab83603832e66750f7b5f1f73eaa5.1777972790.git.phahn-oss@avm.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: FRITZ! Technology GmbH, Berlin, Germany Content-Transfer-Encoding: quoted-printable X-purgate-ID: 149429::1777973200-69640582-005E6247/0/0 X-purgate-type: clean X-purgate-size: 1087 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Content-Type: text/plain; charset="utf-8" From: Philipp Hahn Currently there are several (sub-)documents for "Generic kernel infrastructure API" and several "driver specific" documents. Put each one into its own sub-section. Signed-off-by: Philipp Hahn --- Documentation/watchdog/index.rst | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Documentation/watchdog/index.rst b/Documentation/watchdog/inde= x.rst index 1cea24681e6bd..293ed05ba6b87 100644 --- a/Documentation/watchdog/index.rst +++ b/Documentation/watchdog/index.rst @@ -4,15 +4,25 @@ Watchdog Support =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +Kernel infrastructure +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + .. toctree:: :maxdepth: 1 =20 - hpwdt - mlx-wdt - pcwd-watchdog watchdog-api watchdog-kernel-api - watchdog-parameters watchdog-pm - wdt convert_drivers_to_kernel_api + +Driver specific +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +.. toctree:: + :maxdepth: 1 + + watchdog-parameters + hpwdt + wdt + mlx-wdt + pcwd-watchdog --=20 2.43.0 From nobody Sat Jun 13 23:06:28 2026 Received: from mail.avm.de (mail.avm.de [212.42.244.94]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77747327C18; Tue, 5 May 2026 09:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.94 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; cv=none; b=nQXzXLKaxxKuIgZPoUeKRSZ96o9Kj/bfv6eyemaINMjlYflZ8LWWKJB3rzycl14KXxiJ06TJReUrn4fh6IZqwl1l5Ot4oC1nRO7xxf39p0jzwNIgZlGOtt/ZejEeG+tZPsT1MWgEs6pu4eX5Ql83PitbWlmJ0/S+zYVz/67QOqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777973208; c=relaxed/simple; bh=6JR1rI7E1CBXEUhksGIm+JDj7sfufWA39XmqmTsMT7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qplkfSU52aRi0j3LYD5WInvl5/ZpwpxF6aeFkelbzFU3YDK9gP2RMOFqtVDk7ynNe1bjusesgiF+m66HCN7/fvA1YYeqv+oZscO75BpITR6C+8MiP1E1I4iu6nChbqkT8j+94DO7N3EENyz1Smo6bCf11ooEauTBXV8FlomeLoI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de; spf=pass smtp.mailfrom=avm.de; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b=vogu4m1m; arc=none smtp.client-ip=212.42.244.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=avm.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=avm.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=avm.de header.i=@avm.de header.b="vogu4m1m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1777973201; bh=6JR1rI7E1CBXEUhksGIm+JDj7sfufWA39XmqmTsMT7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vogu4m1mVl1rgDwJlaltvU0y6q3rWkzyPmkcYxHfrRvHl1UnXRBGH4ur03ysBtEbw 9ad2FuJx3+bXa3RySQHWgsIOyIqcrA1/8vSRaJPzCTdBXk6E8xz9PA9MYxVIxr4Epb s8C8vrqTprAley2FDV0KPyGKftJzfOK14FkwNVBk= Received: from [2001:bf0:244:244::71] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.56.1) (envelope-from ) id 69f9b7d0-23fc-7f0000032729-7f000001b35e-1 for ; Tue, 05 May 2026 11:26:40 +0200 Received: from mail-auth.avm.de (dovecot-mx-01.avm.de [IPv6:2001:bf0:244:244::71]) by mail.avm.de (Postfix) with ESMTPS; Tue, 5 May 2026 11:26:40 +0200 (CEST) From: Philipp Hahn To: Wim Van Sebroeck , Guenter Roeck Cc: Philipp Hahn , linux-watchdog@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] watchdog: Prefix WDT with ICS for clarity Date: Tue, 5 May 2026 11:26:16 +0200 Message-ID: <5a71979d8e8ab8e0a30de33f6aa2540b3b5dc1ee.1777972790.git.phahn-oss@avm.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: FRITZ! Technology GmbH, Berlin, Germany Content-Transfer-Encoding: quoted-printable X-purgate-ID: 149429::1777973200-BAC19EEC-24DBE6AA/0/0 X-purgate-type: clean X-purgate-size: 3615 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Content-Type: text/plain; charset="utf-8" From: Philipp Hahn `wdt.rst` is only about the Watchdog from "Industrial Computer Source" (ICS). Change the title and rename the file to better express this. Add missing SPDX license identifier `GPL-2.0-or-later` same as code to silence `checkpatch`. Fix wrong link to sample driver in drivers/watchdog/smsc37b787_wdt.c. Signed-off-by: Philipp Hahn --- Documentation/watchdog/{wdt.rst =3D> ics-wdt.rst} | 8 +++++--- Documentation/watchdog/index.rst | 2 +- drivers/watchdog/Kconfig | 10 ++++++---- drivers/watchdog/smsc37b787_wdt.c | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) rename Documentation/watchdog/{wdt.rst =3D> ics-wdt.rst} (91%) diff --git a/Documentation/watchdog/wdt.rst b/Documentation/watchdog/ics-wd= t.rst similarity index 91% rename from Documentation/watchdog/wdt.rst rename to Documentation/watchdog/ics-wdt.rst index d97b0361535b0..b0dc29e56358d 100644 --- a/Documentation/watchdog/wdt.rst +++ b/Documentation/watchdog/ics-wdt.rst @@ -1,6 +1,8 @@ -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -WDT Watchdog Timer Interfaces For The Linux Operating System -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +.. SPDX-License-Identifier: GPL-2.0-or-later + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Industrial Computer Source Watchdog Driver +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Last Reviewed: 10/05/2007 =20 diff --git a/Documentation/watchdog/index.rst b/Documentation/watchdog/inde= x.rst index 293ed05ba6b87..dbc702b31a43e 100644 --- a/Documentation/watchdog/index.rst +++ b/Documentation/watchdog/index.rst @@ -23,6 +23,6 @@ Driver specific =20 watchdog-parameters hpwdt - wdt + ics-wdt mlx-wdt pcwd-watchdog diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index dc78729ba2a5d..43c2ee69caada 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -2270,10 +2270,11 @@ config MIXCOMWD Most people will say N. =20 config WDT - tristate "WDT Watchdog timer" + tristate "ICS WDT500P/501P Watchdog timer" depends on ISA help - If you have a WDT500P or WDT501P watchdog board, say Y here, + If you have an Industrial Computer Source (ICS) WDT500P or WDT501P + watchdog board, say Y here, otherwise N. It is not possible to probe for this board, which means that you have to inform the kernel about the IO port and IRQ that is needed (you can do this via the io and irq parameters) @@ -2304,10 +2305,11 @@ config PCIPCWATCHDOG Most people will say N. =20 config WDTPCI - tristate "PCI-WDT500/501 Watchdog timer" + tristate "ICS PCI-WDT500/501 Watchdog timer" depends on PCI && HAS_IOPORT help - If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N. + If you have an Industrial Computer Source (ICS) PCI-WDT500/501 watchdog + board, say Y here, otherwise N. =20 If you have a PCI-WDT501 watchdog board then you can enable the temperature sensor by setting the type parameter to 501. diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b78= 7_wdt.c index 3011e1af00f98..9f2c2ab4e2f15 100644 --- a/drivers/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c @@ -36,7 +36,7 @@ * mknod /dev/watchdog c 10 130 * * For an example userspace keep-alive daemon, see: - * Documentation/watchdog/wdt.rst + * samples/watchdog/watchdog-simple.c */ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --=20 2.43.0