2022-11-25 22:35:50

by Thomas Weißschuh

Subject: [PATCH] watchdog: iTCO_wdt: Report firmware_version

Synchronize the reported information in dmesg and the watchdog APIs.

Signed-off-by: Thomas Weißschuh <[email protected]>
---
drivers/watchdog/iTCO_wdt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 34693f11385f..9b3c9f8b0b93 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -437,11 +437,10 @@ static void iTCO_wdt_set_running(struct iTCO_wdt_private *p)
* Kernel Interfaces
*/

-static const struct watchdog_info ident = {
+static struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT |
WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
- .firmware_version = 0,
.identity = DRV_NAME,
};

@@ -562,6 +561,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
break;
}

+ ident.firmware_version = p->iTCO_version;
p->wddev.info = &ident,
p->wddev.ops = &iTCO_wdt_ops,
p->wddev.bootstatus = 0;

base-commit: 0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536
--
2.38.1

2022-11-26 00:56:31

by Guenter Roeck

Subject: Re: [PATCH] watchdog: iTCO_wdt: Report firmware_version

On 11/25/22 14:12, Thomas Weißschuh wrote:
> Synchronize the reported information in dmesg and the watchdog APIs.
>
> Signed-off-by: Thomas Weißschuh <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/iTCO_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 34693f11385f..9b3c9f8b0b93 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -437,11 +437,10 @@ static void iTCO_wdt_set_running(struct iTCO_wdt_private *p)
> * Kernel Interfaces
> */
>
> -static const struct watchdog_info ident = {
> +static struct watchdog_info ident = {
> .options = WDIOF_SETTIMEOUT |
> WDIOF_KEEPALIVEPING |
> WDIOF_MAGICCLOSE,
> - .firmware_version = 0,
> .identity = DRV_NAME,
> };
>
> @@ -562,6 +561,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> break;
> }
>
> + ident.firmware_version = p->iTCO_version;
> p->wddev.info = &ident,
> p->wddev.ops = &iTCO_wdt_ops,
> p->wddev.bootstatus = 0;
>
> base-commit: 0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536