Skip to contentSkip to conversation

watchdog: iTCO_wdt: Report firmware_version

PATCH In review Thomas Weißschuh 2 participants 2 messages Nov 25, 2022 – Nov 26, 2022 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: iTCO_wdt: Report firmware_version

Synchronize the reported information in dmesg and the watchdog APIs.

---
 drivers/watchdog/iTCO_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +2 -2
index 34693f11385f..9b3c9f8b0b93 100644
@@ -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

Signature · 1 line
2.38.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Thomas Weißschuh

Synchronize the reported information in dmesg and the watchdog APIs.

Quoted 31 lines
---
  drivers/watchdog/iTCO_wdt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +2 -2
index 34693f11385f..9b3c9f8b0b93 100644
@@ -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