All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] watchdog: gpio-wdt: Rename notifier to reboot_notifier
@ 2015-11-09  9:55 Alexander Stein
  2015-11-09  9:55 ` [PATCH 2/2] watchdog: gpio-wdt: Add panic notifier Alexander Stein
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Alexander Stein @ 2015-11-09  9:55 UTC (permalink / raw)
  To: Wim Van Sebroeck; +Cc: Alexander Stein, linux-watchdog

This is a preparation before adding a panic notifier.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
 drivers/watchdog/gpio_wdt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 90d59d3f..c7b8a06 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -36,7 +36,7 @@ struct gpio_wdt_priv {
 	unsigned int		hw_algo;
 	unsigned int		hw_margin;
 	unsigned long		last_jiffies;
-	struct notifier_block	notifier;
+	struct notifier_block	reboot_notifier;
 	struct timer_list	timer;
 	struct watchdog_device	wdd;
 };
@@ -130,7 +130,7 @@ static int gpio_wdt_notify_sys(struct notifier_block *nb, unsigned long code,
 			       void *unused)
 {
 	struct gpio_wdt_priv *priv = container_of(nb, struct gpio_wdt_priv,
-						  notifier);
+						  reboot_notifier);
 
 	mod_timer(&priv->timer, 0);
 
@@ -228,8 +228,8 @@ static int gpio_wdt_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	priv->notifier.notifier_call = gpio_wdt_notify_sys;
-	ret = register_reboot_notifier(&priv->notifier);
+	priv->reboot_notifier.notifier_call = gpio_wdt_notify_sys;
+	ret = register_reboot_notifier(&priv->reboot_notifier);
 	if (ret)
 		goto error_unregister;
 
@@ -248,7 +248,7 @@ static int gpio_wdt_remove(struct platform_device *pdev)
 	struct gpio_wdt_priv *priv = platform_get_drvdata(pdev);
 
 	del_timer_sync(&priv->timer);
-	unregister_reboot_notifier(&priv->notifier);
+	unregister_reboot_notifier(&priv->reboot_notifier);
 	watchdog_unregister_device(&priv->wdd);
 
 	return 0;
-- 
2.4.10


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2015-11-23 16:02 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-09  9:55 [PATCH 1/2] watchdog: gpio-wdt: Rename notifier to reboot_notifier Alexander Stein
2015-11-09  9:55 ` [PATCH 2/2] watchdog: gpio-wdt: Add panic notifier Alexander Stein
2015-11-09 15:19   ` Guenter Roeck
2015-11-09 15:46     ` Alexander Stein
2015-11-09 19:02     ` Uwe Kleine-König
2015-11-09 23:19       ` Guenter Roeck
2015-11-10  7:20         ` Uwe Kleine-König
2015-11-13 18:44           ` Guenter Roeck
2015-11-09 15:12 ` [PATCH 1/2] watchdog: gpio-wdt: Rename notifier to reboot_notifier Guenter Roeck
2015-11-23  5:33 ` Guenter Roeck
2015-11-23 13:29   ` Alexander Stein
2015-11-23 16:02     ` Guenter Roeck

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.