[WATCHDOG] C99 struct initialisers for shwdt

diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c
index 8761e4a92736d50cffda3d43ce26a47f14d36980..2f32ebc5708ec6443b966f4de3b4bce37d1150df 100644 (file)
--- a/drivers/char/watchdog/shwdt.c
+++ b/drivers/char/watchdog/shwdt.c
@@ -334,21 +334,21 @@ static struct file_operations sh_wdt_fops = {
 };
 
 static struct watchdog_info sh_wdt_info = {
-       WDIOF_KEEPALIVEPING,
-       1,
-       "SH WDT",
+       .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+       .firmware_version = 1,
+       .identity = "SH WDT",
 };
 
 static struct notifier_block sh_wdt_notifier = {
-       sh_wdt_notify_sys,
-       NULL,
-       0
+       .notifier_call = sh_wdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static struct miscdevice sh_wdt_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &sh_wdt_fops,
+       .minor = WATCHDOG_MINOR,
+       .name = "watchdog",
+       .fops &sh_wdt_fops,
 };
 
 /**