[WATCHDOG] C99 struct intiialisers for remaining drivers.

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 7a67ceeac45f5518f487b35c68436411f489bb6e..da868c671eefe589513d4127fad29e8b08334754 100644 (file)
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -453,9 +453,9 @@ static struct file_operations zf_fops = {
 };
 
 static struct miscdevice zf_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &zf_fops
+       .minor = WATCHDOG_MINOR,
+       .name = "watchdog",
+       .fops = &zf_fops
 };
                                                                         
 
@@ -464,9 +464,9 @@ static struct miscdevice zf_miscdev = {
  * turn the timebomb registers off.
  */
 static struct notifier_block zf_notifier = {
-       zf_notify_sys,
-       NULL,
-       0
+       .notifier_call = zf_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static void __init zf_show_action(int act)

diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c
index 15fbbd831cc40e9b52d4886394d21ff94b81a716..b14f9ff7a861d283cacaef45c3a0949652097453 100644 (file)
--- a/drivers/char/watchdog/sbc60xxwdt.c
+++ b/drivers/char/watchdog/sbc60xxwdt.c
@@ -267,9 +267,9 @@ static struct file_operations wdt_fops = {
 };
 
 static struct miscdevice wdt_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &wdt_fops
+       .minor = WATCHDOG_MINOR,
+       .name = "watchdog",
+       .fops = &wdt_fops
 };
 
 /*
@@ -291,9 +291,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
  
 static struct notifier_block wdt_notifier=
 {
-       wdt_notify_sys,
-       0,
-       0
+       .notifier_call = wdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static void __exit sbc60xxwdt_unload(void)

diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index 3a98c8b6d7608c1cc71be8bd09686e968c75c525..87ec170d2e066cba67a016a3673999649a29bc50 100644 (file)
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -281,18 +281,18 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 }
 
 static struct file_operations wdt_fops = {
-       owner:          THIS_MODULE,
-       llseek:         fop_llseek,
-       write:          fop_write,
-       open:           fop_open,
-       release:        fop_close,
-       ioctl:          fop_ioctl
+       .owner          = THIS_MODULE,
+       .llseek         = fop_llseek,
+       .write          = fop_write,
+       .open           = fop_open,
+       .release        = fop_close,
+       .ioctl          = fop_ioctl
 };
 
 static struct miscdevice wdt_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &wdt_fops
+       .minor  = WATCHDOG_MINOR,
+       .name   = "watchdog",
+       .fops   = &wdt_fops
 };
 
 /*
@@ -314,9 +314,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
  
 static struct notifier_block wdt_notifier=
 {
-       wdt_notify_sys,
-       0,
-       0
+       .notifier_call = wdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static void __exit sc520_wdt_unload(void)

diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c
index 5a852f657b5b97525c5d5da2622ea4abe8aecd2b..a293fdc96913bb709617a71cbf046aab919a4856 100644 (file)
--- a/drivers/char/watchdog/w83877f_wdt.c
+++ b/drivers/char/watchdog/w83877f_wdt.c
@@ -275,9 +275,9 @@ static struct file_operations wdt_fops = {
 };
 
 static struct miscdevice wdt_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &wdt_fops
+       .minor  = WATCHDOG_MINOR,
+       .name   = "watchdog",
+       .fops   = &wdt_fops
 };
 
 /*
@@ -299,9 +299,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
  
 static struct notifier_block wdt_notifier=
 {
-       wdt_notify_sys,
-       0,
-       0
+       .notifier_call = wdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static void __exit w83877f_wdt_unload(void)

diff --git a/drivers/char/watchdog/wafer5823wdt.c b/drivers/char/watchdog/wafer5823wdt.c
index 858713e435f5d09006423208c57e6d696e303c1d..66eff3a2ece23b3584859d1c46db5337b941afc6 100644 (file)
--- a/drivers/char/watchdog/wafer5823wdt.c
+++ b/drivers/char/watchdog/wafer5823wdt.c
@@ -198,17 +198,17 @@ static int wafwdt_notify_sys(struct notifier_block *this, unsigned long code, vo
  */
 
 static struct file_operations wafwdt_fops = {
-       owner:THIS_MODULE,
-       write:wafwdt_write,
-       ioctl:wafwdt_ioctl,
-       open:wafwdt_open,
-       release:wafwdt_close,
+       .owner          = THIS_MODULE,
+       .write          = wafwdt_write,
+       .ioctl          = wafwdt_ioctl,
+       .open           = wafwdt_open,
+       .release        = wafwdt_close,
 };
 
 static struct miscdevice wafwdt_miscdev = {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &wafwdt_fops
+       .minor  = WATCHDOG_MINOR,
+       .name   = "watchdog",
+       .fops   = &wafwdt_fops
 };
 
 /*
@@ -217,9 +217,9 @@ static struct miscdevice wafwdt_miscdev = {
  */
 
 static struct notifier_block wafwdt_notifier = {
-       wafwdt_notify_sys,
-       NULL,
-       0
+       .notifier_call = wafwdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 static int __init wafwdt_init(void)

diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 6b7a2ea9f0546068c8608f5ddb06be34136b4332..74e5f7368d4262899e7d4acda8f0ae9ab3fe722e 100644 (file)
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -465,17 +465,17 @@ static struct file_operations wdt_fops = {
 
 static struct miscdevice wdt_miscdev=
 {
-       WATCHDOG_MINOR,
-       "watchdog",
-       &wdt_fops
+       .minor  = WATCHDOG_MINOR,
+       .name   = "watchdog",
+       .fops   = &wdt_fops
 };
 
 #ifdef CONFIG_WDT_501
 static struct miscdevice temp_miscdev=
 {
-       TEMP_MINOR,
-       "temperature",
-       &wdt_fops
+       .minor  = TEMP_MINOR,
+       .name   = "temperature",
+       .fops   = &wdt_fops
 };
 #endif
 
@@ -486,9 +486,9 @@ static struct miscdevice temp_miscdev=
  
 static struct notifier_block wdt_notifier=
 {
-       wdt_notify_sys,
-       NULL,
-       0
+       .notifier_call = wdt_notify_sys,
+       .next = NULL,
+       .priority = 0
 };
 
 /**

diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c
index 5b12542844b549449028f1681d4137bb2006c8b9..49925dadfe55ca0f7c78b45a3f98d051f9f64393 100644 (file)
--- a/drivers/char/watchdog/wdt977.c
+++ b/drivers/char/watchdog/wdt977.c
@@ -258,7 +258,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file,
          unsigned int cmd, unsigned long arg)
 {
 static struct watchdog_info ident = {
-       identity        : "Winbond 83977"
+       .identity = "Winbond 83977"
 };
 
 int temp;