Skip to contentSkip to conversation

watchdog: Do not use 'dev' from watchdog_device in watchdog drivers

PATCH In review Guenter Roeck 2 participants 8 messages Dec 24, 2015 – Dec 29, 2015

Subsystems (5)
lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

v2 cover watchdog: Do not use 'dev' from watchdog_device in watchdog drivers

The 'dev' variable in watchdog drivers has a different lifetime than the watchdog character device and should therefore not be used by watchdog drivers.

Some of the drivers use the variable to print kernel messages. Those messages are either dropped or changed to use the parent device. One driver sets the variable during initialization to the watchdog driver's parent device, which is wrong and was removed.

v2: Use parent device for dev_XXX messages instead of pr_XXX.

author maintainer
#1 lore raw

PATCH v2 1/5 watchdog: bcm2835_wdt: Drop log message if watchdog is stopped

Stopping a watchdog is a normal operation and does not warrant a log message.

---
v2: No change

 drivers/watchdog/bcm2835_wdt.c | 1 -
 1 file changed, 1 deletion(-)
drivers/watchdog/bcm2835_wdt.c +0 -1
index 8a5ce5b5a0b6..2e6164c4abc0 100644
@@ -79,7 +79,6 @@ static int bcm2835_wdt_stop(struct watchdog_device *wdog)
 	struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
 
 	writel_relaxed(PM_PASSWORD | PM_RSTC_RESET, wdt->base + PM_RSTC);
-	dev_info(wdog->dev, "Watchdog timer stopped");
 	return 0;
 }
 
Signature · 1 line
2.1.4
author maintainer
#2 lore raw

PATCH v2 2/5 watchdog: tangox: Print info message using pointer to platform device

In reply to Guenter Roeck

The device pointer in struct watchdog_device should not be used by drivers and may be removed in the near future. Use the platform device pointer for info messages instead.

---
v2: No change

 drivers/watchdog/tangox_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/tangox_wdt.c +1 -1
index b9ee6246e7c2..709c1ed6fd79 100644
@@ -184,7 +184,7 @@ static int tangox_wdt_probe(struct platform_device *pdev)
 	if (err)
 		dev_warn(&pdev->dev, "failed to register restart handler\n");
 
-	dev_info(dev->wdt.dev, "SMP86xx/SMP87xx watchdog registered\n");
+	dev_info(&pdev->dev, "SMP86xx/SMP87xx watchdog registered\n");
 
 	return 0;
 }
Signature · 1 line
2.1.4
author maintainer
#3 lore raw

PATCH v2 3/5 watchdog: gpio: Do not use device pointer from struct watchdog_device

In reply to Guenter Roeck

The device pointer in struct watchdog_device has a different lifetime than the driver code and should not be used in drivers. Use the pointer to the parent device instead.

---
v2: Print messages using parent device

 drivers/watchdog/gpio_wdt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/watchdog/gpio_wdt.c +2 -1
index 035c2387b846..ba066e4a707b 100644
@@ -54,7 +54,8 @@ static void gpio_wdt_hwping(unsigned long data)
 
 	if (priv->armed && time_after(jiffies, priv->last_jiffies +
 				      msecs_to_jiffies(wdd->timeout * 1000))) {
-		dev_crit(wdd->dev, "Timer expired. System will reboot soon!\n");
+		dev_crit(wdd->parent,
+			 "Timer expired. System will reboot soon!\n");
 		return;
 	}
 
Signature · 1 line
2.1.4
author maintainer
#4 lore raw

PATCH v2 4/5 watchdog: mena21: Do not use device pointer from struct watchdog_device

In reply to Guenter Roeck

The device pointer in struct watchdog_device has a different lifetime than the driver code and should not be used in drivers. Use the pointer to the parent device instead.

---
v2: Print messages using parent device

 drivers/watchdog/mena21_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/mena21_wdt.c +2 -2
index 098fa9c34d6d..af6a7c489f08 100644
@@ -100,12 +100,12 @@ static int a21_wdt_set_timeout(struct watchdog_device *wdt,
 	struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
 
 	if (timeout != 1 && timeout != 30) {
-		dev_err(wdt->dev, "Only 1 and 30 allowed as timeout\n");
+		dev_err(wdt->parent, "Only 1 and 30 allowed as timeout\n");
 		return -EINVAL;
 	}
 
 	if (timeout == 30 && wdt->timeout == 1) {
-		dev_err(wdt->dev,
+		dev_err(wdt->parent,
 			"Transition from fast to slow mode not allowed\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.1.4
author maintainer
#5 lore raw

PATCH v2 5/5 watchdog: qcom-wdt: Do not set 'dev' in struct watchdog_device

In reply to Guenter Roeck

The 'dev' pointer in struct watchdog_device is set by the watchdog core when registering the watchdog device and not by the driver. It points to the watchdog device, not its parent.

---
v2: No change

 drivers/watchdog/qcom-wdt.c | 1 -
 1 file changed, 1 deletion(-)
drivers/watchdog/qcom-wdt.c +0 -1
index aa7105d32c02..424f9a952fee 100644
@@ -164,7 +164,6 @@ static int qcom_wdt_probe(struct platform_device *pdev)
 		goto err_clk_unprepare;
 	}
 
-	wdt->wdd.dev = &pdev->dev;
 	wdt->wdd.info = &qcom_wdt_info;
 	wdt->wdd.ops = &qcom_wdt_ops;
 	wdt->wdd.min_timeout = 1;
Signature · 1 line
2.1.4
#6 lore raw
In reply to Guenter Roeck

Hi Guenter,

Quoted 10 lines

The 'dev' variable in watchdog drivers has a different lifetime than the watchdog character device and should therefore not be used by watchdog drivers.

Some of the drivers use the variable to print kernel messages. Those messages are either dropped or changed to use the parent device. One driver sets the variable during initialization to the watchdog driver's parent device, which is wrong and was removed.

v2: Use parent device for dev_XXX messages instead of pr_XXX.

This patchset has been added to linux-watchdog-next.

Kind regards,
Wim.

author maintainer
#7 lore raw
Quoted 6 lines · Wim Van Sebroeck

Hi Guenter,

Quoted 4 lines

The 'dev' variable in watchdog drivers has a different lifetime than the watchdog character device and should therefore not be used by watchdog drivers.

Quoted 9 lines
Quoted 6 lines

Some of the drivers use the variable to print kernel messages. Those messages are either dropped or changed to use the parent device. One driver sets the variable during initialization to the watchdog driver's parent device, which is wrong and was removed.

v2: Use parent device for dev_XXX messages instead of pr_XXX.

This patchset has been added to linux-watchdog-next.

Thanks!

Guenter