Commit 9051f9de authored by Dave Jones's avatar Dave Jones

[WATCHDOG] C99 struct intiialisers for remaining drivers.

parent 131fc921
...@@ -453,9 +453,9 @@ static struct file_operations zf_fops = { ...@@ -453,9 +453,9 @@ static struct file_operations zf_fops = {
}; };
static struct miscdevice zf_miscdev = { static struct miscdevice zf_miscdev = {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&zf_fops .fops = &zf_fops
}; };
...@@ -464,9 +464,9 @@ static struct miscdevice zf_miscdev = { ...@@ -464,9 +464,9 @@ static struct miscdevice zf_miscdev = {
* turn the timebomb registers off. * turn the timebomb registers off.
*/ */
static struct notifier_block zf_notifier = { static struct notifier_block zf_notifier = {
zf_notify_sys, .notifier_call = zf_notify_sys,
NULL, .next = NULL,
0 .priority = 0
}; };
static void __init zf_show_action(int act) static void __init zf_show_action(int act)
......
...@@ -267,9 +267,9 @@ static struct file_operations wdt_fops = { ...@@ -267,9 +267,9 @@ static struct file_operations wdt_fops = {
}; };
static struct miscdevice wdt_miscdev = { static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&wdt_fops .fops = &wdt_fops
}; };
/* /*
...@@ -291,9 +291,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, ...@@ -291,9 +291,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier= static struct notifier_block wdt_notifier=
{ {
wdt_notify_sys, .notifier_call = wdt_notify_sys,
0, .next = NULL,
0 .priority = 0
}; };
static void __exit sbc60xxwdt_unload(void) static void __exit sbc60xxwdt_unload(void)
......
...@@ -281,18 +281,18 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -281,18 +281,18 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
} }
static struct file_operations wdt_fops = { static struct file_operations wdt_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: fop_llseek, .llseek = fop_llseek,
write: fop_write, .write = fop_write,
open: fop_open, .open = fop_open,
release: fop_close, .release = fop_close,
ioctl: fop_ioctl .ioctl = fop_ioctl
}; };
static struct miscdevice wdt_miscdev = { static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&wdt_fops .fops = &wdt_fops
}; };
/* /*
...@@ -314,9 +314,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, ...@@ -314,9 +314,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier= static struct notifier_block wdt_notifier=
{ {
wdt_notify_sys, .notifier_call = wdt_notify_sys,
0, .next = NULL,
0 .priority = 0
}; };
static void __exit sc520_wdt_unload(void) static void __exit sc520_wdt_unload(void)
......
...@@ -275,9 +275,9 @@ static struct file_operations wdt_fops = { ...@@ -275,9 +275,9 @@ static struct file_operations wdt_fops = {
}; };
static struct miscdevice wdt_miscdev = { static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&wdt_fops .fops = &wdt_fops
}; };
/* /*
...@@ -299,9 +299,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, ...@@ -299,9 +299,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier= static struct notifier_block wdt_notifier=
{ {
wdt_notify_sys, .notifier_call = wdt_notify_sys,
0, .next = NULL,
0 .priority = 0
}; };
static void __exit w83877f_wdt_unload(void) static void __exit w83877f_wdt_unload(void)
......
...@@ -198,17 +198,17 @@ static int wafwdt_notify_sys(struct notifier_block *this, unsigned long code, vo ...@@ -198,17 +198,17 @@ static int wafwdt_notify_sys(struct notifier_block *this, unsigned long code, vo
*/ */
static struct file_operations wafwdt_fops = { static struct file_operations wafwdt_fops = {
owner:THIS_MODULE, .owner = THIS_MODULE,
write:wafwdt_write, .write = wafwdt_write,
ioctl:wafwdt_ioctl, .ioctl = wafwdt_ioctl,
open:wafwdt_open, .open = wafwdt_open,
release:wafwdt_close, .release = wafwdt_close,
}; };
static struct miscdevice wafwdt_miscdev = { static struct miscdevice wafwdt_miscdev = {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&wafwdt_fops .fops = &wafwdt_fops
}; };
/* /*
...@@ -217,9 +217,9 @@ static struct miscdevice wafwdt_miscdev = { ...@@ -217,9 +217,9 @@ static struct miscdevice wafwdt_miscdev = {
*/ */
static struct notifier_block wafwdt_notifier = { static struct notifier_block wafwdt_notifier = {
wafwdt_notify_sys, .notifier_call = wafwdt_notify_sys,
NULL, .next = NULL,
0 .priority = 0
}; };
static int __init wafwdt_init(void) static int __init wafwdt_init(void)
......
...@@ -465,17 +465,17 @@ static struct file_operations wdt_fops = { ...@@ -465,17 +465,17 @@ static struct file_operations wdt_fops = {
static struct miscdevice wdt_miscdev= static struct miscdevice wdt_miscdev=
{ {
WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
"watchdog", .name = "watchdog",
&wdt_fops .fops = &wdt_fops
}; };
#ifdef CONFIG_WDT_501 #ifdef CONFIG_WDT_501
static struct miscdevice temp_miscdev= static struct miscdevice temp_miscdev=
{ {
TEMP_MINOR, .minor = TEMP_MINOR,
"temperature", .name = "temperature",
&wdt_fops .fops = &wdt_fops
}; };
#endif #endif
...@@ -486,9 +486,9 @@ static struct miscdevice temp_miscdev= ...@@ -486,9 +486,9 @@ static struct miscdevice temp_miscdev=
static struct notifier_block wdt_notifier= static struct notifier_block wdt_notifier=
{ {
wdt_notify_sys, .notifier_call = wdt_notify_sys,
NULL, .next = NULL,
0 .priority = 0
}; };
/** /**
......
...@@ -258,7 +258,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file, ...@@ -258,7 +258,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
static struct watchdog_info ident = { static struct watchdog_info ident = {
identity : "Winbond 83977" .identity = "Winbond 83977"
}; };
int temp; int temp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment