Commit 1add29dd authored by Rusty Russell's avatar Rusty Russell Committed by David S. Miller

SPARC: Use ISO C struct initializers.

parent 47e4a053
...@@ -115,9 +115,9 @@ static int apc_ioctl(struct inode *inode, struct file *f, ...@@ -115,9 +115,9 @@ static int apc_ioctl(struct inode *inode, struct file *f,
} }
static struct file_operations apc_fops = { static struct file_operations apc_fops = {
ioctl: apc_ioctl, .ioctl = apc_ioctl,
open: apc_open, .open = apc_open,
release: apc_release, .release = apc_release,
}; };
static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops }; static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };
......
...@@ -140,10 +140,10 @@ prom_console_write(struct console *con, const char *s, unsigned n) ...@@ -140,10 +140,10 @@ prom_console_write(struct console *con, const char *s, unsigned n)
} }
static struct console prom_debug_console = { static struct console prom_debug_console = {
name: "debug", .name = "debug",
write: prom_console_write, .write = prom_console_write,
flags: CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
index: -1, .index = -1,
}; };
int obp_system_intr(void) int obp_system_intr(void)
...@@ -518,8 +518,8 @@ static void c_stop(struct seq_file *m, void *v) ...@@ -518,8 +518,8 @@ static void c_stop(struct seq_file *m, void *v)
} }
struct seq_operations cpuinfo_op = { struct seq_operations cpuinfo_op = {
start: c_start, .start =c_start,
next: c_next, .next = c_next,
stop: c_stop, .stop = c_stop,
show: show_cpuinfo, .show = show_cpuinfo,
}; };
...@@ -78,10 +78,10 @@ prom_console_write(struct console *con, const char *s, unsigned n) ...@@ -78,10 +78,10 @@ prom_console_write(struct console *con, const char *s, unsigned n)
} }
static struct console prom_console = { static struct console prom_console = {
name: "prom", .name = "prom",
write: prom_console_write, .write = prom_console_write,
flags: CON_CONSDEV | CON_ENABLED, .flags = CON_CONSDEV | CON_ENABLED,
index: -1, .index = -1,
}; };
#define PROM_TRUE -1 #define PROM_TRUE -1
...@@ -324,10 +324,10 @@ static int console_fb __initdata = 0; ...@@ -324,10 +324,10 @@ static int console_fb __initdata = 0;
unsigned long cmdline_memory_size = 0; unsigned long cmdline_memory_size = 0;
static struct console prom_debug_console = { static struct console prom_debug_console = {
name: "debug", .name = "debug",
write: prom_console_write, .write = prom_console_write,
flags: CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
index: -1, .index = -1,
}; };
/* XXX Implement this at some point... */ /* XXX Implement this at some point... */
...@@ -686,8 +686,8 @@ static void c_stop(struct seq_file *m, void *v) ...@@ -686,8 +686,8 @@ static void c_stop(struct seq_file *m, void *v)
} }
struct seq_operations cpuinfo_op = { struct seq_operations cpuinfo_op = {
start: c_start, .start =c_start,
next: c_next, .next = c_next,
stop: c_stop, .stop = c_stop,
show: show_cpuinfo, .show = show_cpuinfo,
}; };
...@@ -708,14 +708,14 @@ asmlinkage void solaris_register(void) ...@@ -708,14 +708,14 @@ asmlinkage void solaris_register(void)
extern long solaris_to_linux_signals[], linux_to_solaris_signals[]; extern long solaris_to_linux_signals[], linux_to_solaris_signals[];
struct exec_domain solaris_exec_domain = { struct exec_domain solaris_exec_domain = {
name: "Solaris", .name = "Solaris",
handler: NULL, .handler = NULL,
pers_low: 1, /* PER_SVR4 personality */ .pers_low = 1, /* PER_SVR4 personality */
pers_high: 1, .pers_high = 1,
signal_map: solaris_to_linux_signals, .signal_map = solaris_to_linux_signals,
signal_invmap: linux_to_solaris_signals, .signal_invmap =linux_to_solaris_signals,
module: THIS_MODULE, .module = THIS_MODULE,
next: NULL .next = NULL
}; };
extern int init_socksys(void); extern int init_socksys(void);
......
...@@ -165,8 +165,8 @@ static unsigned int socksys_poll(struct file * filp, poll_table * wait) ...@@ -165,8 +165,8 @@ static unsigned int socksys_poll(struct file * filp, poll_table * wait)
} }
static struct file_operations socksys_fops = { static struct file_operations socksys_fops = {
open: socksys_open, .open = socksys_open,
release: socksys_release, .release = socksys_release,
}; };
static devfs_handle_t devfs_handle; static devfs_handle_t devfs_handle;
......
...@@ -1694,9 +1694,9 @@ static int sparcaudio_ioctl(struct inode * inode, struct file * file, ...@@ -1694,9 +1694,9 @@ static int sparcaudio_ioctl(struct inode * inode, struct file * file,
} }
static struct file_operations sparcaudioctl_fops = { static struct file_operations sparcaudioctl_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
poll: sparcaudio_poll, .poll = sparcaudio_poll,
ioctl: sparcaudio_ioctl, .ioctl = sparcaudio_ioctl,
}; };
static int sparcaudio_open(struct inode * inode, struct file * file) static int sparcaudio_open(struct inode * inode, struct file * file)
...@@ -1886,14 +1886,14 @@ static int sparcaudio_release(struct inode * inode, struct file * file) ...@@ -1886,14 +1886,14 @@ static int sparcaudio_release(struct inode * inode, struct file * file)
} }
static struct file_operations sparcaudio_fops = { static struct file_operations sparcaudio_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: no_llseek, .llseek = no_llseek,
read: sparcaudio_read, .read = sparcaudio_read,
write: sparcaudio_write, .write = sparcaudio_write,
poll: sparcaudio_poll, .poll = sparcaudio_poll,
ioctl: sparcaudio_ioctl, .ioctl = sparcaudio_ioctl,
open: sparcaudio_open, .open = sparcaudio_open,
release: sparcaudio_release, .release = sparcaudio_release,
}; };
static struct { static struct {
......
...@@ -859,12 +859,12 @@ static int bpp_ioctl(struct inode *inode, struct file *f, unsigned int cmd, ...@@ -859,12 +859,12 @@ static int bpp_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
} }
static struct file_operations bpp_fops = { static struct file_operations bpp_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: bpp_read, .read = bpp_read,
write: bpp_write, .write = bpp_write,
ioctl: bpp_ioctl, .ioctl = bpp_ioctl,
open: bpp_open, .open = bpp_open,
release: bpp_release, .release = bpp_release,
}; };
#if defined(__i386__) #if defined(__i386__)
......
...@@ -460,12 +460,12 @@ static void wd_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -460,12 +460,12 @@ static void wd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
} }
static struct file_operations wd_fops = { static struct file_operations wd_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
ioctl: wd_ioctl, .ioctl = wd_ioctl,
open: wd_open, .open = wd_open,
write: wd_write, .write = wd_write,
read: wd_read, .read = wd_read,
release: wd_release, .release = wd_release,
}; };
static struct miscdevice wd0_miscdev = { WD0_MINOR, WD0_DEVNAME, &wd_fops }; static struct miscdevice wd0_miscdev = { WD0_MINOR, WD0_DEVNAME, &wd_fops };
......
...@@ -164,10 +164,10 @@ static int d7s_ioctl(struct inode *inode, struct file *f, ...@@ -164,10 +164,10 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
} }
static struct file_operations d7s_fops = { static struct file_operations d7s_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
ioctl: d7s_ioctl, .ioctl = d7s_ioctl,
open: d7s_open, .open = d7s_open,
release: d7s_release, .release = d7s_release,
}; };
static struct miscdevice d7s_miscdev = { D7S_MINOR, D7S_DEVNAME, &d7s_fops }; static struct miscdevice d7s_miscdev = { D7S_MINOR, D7S_DEVNAME, &d7s_fops };
......
...@@ -722,11 +722,11 @@ envctrl_release(struct inode *inode, struct file *file) ...@@ -722,11 +722,11 @@ envctrl_release(struct inode *inode, struct file *file)
} }
static struct file_operations envctrl_fops = { static struct file_operations envctrl_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: envctrl_read, .read = envctrl_read,
ioctl: envctrl_ioctl, .ioctl = envctrl_ioctl,
open: envctrl_open, .open = envctrl_open,
release: envctrl_release, .release = envctrl_release,
}; };
static struct miscdevice envctrl_dev = { static struct miscdevice envctrl_dev = {
......
...@@ -148,12 +148,12 @@ static struct file_operations flash_fops = { ...@@ -148,12 +148,12 @@ static struct file_operations flash_fops = {
/* no write to the Flash, use mmap /* no write to the Flash, use mmap
* and play flash dependent tricks. * and play flash dependent tricks.
*/ */
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: flash_llseek, .llseek = flash_llseek,
read: flash_read, .read = flash_read,
mmap: flash_mmap, .mmap = flash_mmap,
open: flash_open, .open = flash_open,
release: flash_release, .release = flash_release,
}; };
static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
......
...@@ -541,23 +541,23 @@ static int jsfd_release(struct inode *inode, struct file *file) ...@@ -541,23 +541,23 @@ static int jsfd_release(struct inode *inode, struct file *file)
} }
static struct file_operations jsf_fops = { static struct file_operations jsf_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: jsf_lseek, .llseek = jsf_lseek,
read: jsf_read, .read = jsf_read,
write: jsf_write, .write = jsf_write,
ioctl: jsf_ioctl, .ioctl = jsf_ioctl,
mmap: jsf_mmap, .mmap = jsf_mmap,
open: jsf_open, .open = jsf_open,
release: jsf_release, .release = jsf_release,
}; };
static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops }; static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops };
static struct block_device_operations jsfd_fops = { static struct block_device_operations jsfd_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: jsfd_open, .open = jsfd_open,
release: jsfd_release, .release = jsfd_release,
ioctl: jsfd_ioctl, .ioctl = jsfd_ioctl,
}; };
int jsflash_init(void) int jsflash_init(void)
......
...@@ -608,11 +608,11 @@ static int openprom_release(struct inode * inode, struct file * file) ...@@ -608,11 +608,11 @@ static int openprom_release(struct inode * inode, struct file * file)
} }
static struct file_operations openprom_fops = { static struct file_operations openprom_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: no_llseek, .llseek = no_llseek,
ioctl: openprom_ioctl, .ioctl = openprom_ioctl,
open: openprom_open, .open = openprom_open,
release: openprom_release, .release = openprom_release,
}; };
static struct miscdevice openprom_dev = { static struct miscdevice openprom_dev = {
......
...@@ -1184,13 +1184,13 @@ static unsigned int aux_poll(struct file *file, poll_table * wait) ...@@ -1184,13 +1184,13 @@ static unsigned int aux_poll(struct file *file, poll_table * wait)
} }
struct file_operations psaux_fops = { struct file_operations psaux_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: aux_read, .read = aux_read,
write: aux_write, .write = aux_write,
poll: aux_poll, .poll = aux_poll,
open: aux_open, .open = aux_open,
release: aux_release, .release = aux_release,
fasync: aux_fasync, .fasync = aux_fasync,
}; };
static int aux_no_open(struct inode *inode, struct file *file) static int aux_no_open(struct inode *inode, struct file *file)
...@@ -1199,8 +1199,8 @@ static int aux_no_open(struct inode *inode, struct file *file) ...@@ -1199,8 +1199,8 @@ static int aux_no_open(struct inode *inode, struct file *file)
} }
struct file_operations psaux_no_fops = { struct file_operations psaux_no_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: aux_no_open, .open = aux_no_open,
}; };
static struct miscdevice psaux_mouse = { static struct miscdevice psaux_mouse = {
......
...@@ -185,12 +185,12 @@ static ssize_t riowd_read(struct file *file, char *buffer, size_t count, loff_t ...@@ -185,12 +185,12 @@ static ssize_t riowd_read(struct file *file, char *buffer, size_t count, loff_t
} }
static struct file_operations riowd_fops = { static struct file_operations riowd_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
ioctl: riowd_ioctl, .ioctl = riowd_ioctl,
open: riowd_open, .open = riowd_open,
write: riowd_write, .write = riowd_write,
read: riowd_read, .read = riowd_read,
release: riowd_release, .release = riowd_release,
}; };
static struct miscdevice riowd_miscdev = { RIOWD_MINOR, RIOWD_NAME, &riowd_fops }; static struct miscdevice riowd_miscdev = { RIOWD_MINOR, RIOWD_NAME, &riowd_fops };
......
...@@ -137,11 +137,11 @@ static int rtc_release(struct inode *inode, struct file *file) ...@@ -137,11 +137,11 @@ static int rtc_release(struct inode *inode, struct file *file)
} }
static struct file_operations rtc_fops = { static struct file_operations rtc_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: no_llseek, .llseek = no_llseek,
ioctl: rtc_ioctl, .ioctl = rtc_ioctl,
open: rtc_open, .open = rtc_open,
release: rtc_release, .release = rtc_release,
}; };
static struct miscdevice rtc_dev = { RTC_MINOR, "rtc", &rtc_fops }; static struct miscdevice rtc_dev = { RTC_MINOR, "rtc", &rtc_fops };
......
...@@ -2608,12 +2608,12 @@ sab82532_console_setup(struct console *con, char *options) ...@@ -2608,12 +2608,12 @@ sab82532_console_setup(struct console *con, char *options)
} }
static struct console sab82532_console = { static struct console sab82532_console = {
name: "ttyS", .name = "ttyS",
write: sab82532_console_write, .write = sab82532_console_write,
device: sab82532_console_device, .device = sab82532_console_device,
setup: sab82532_console_setup, .setup = sab82532_console_setup,
flags: CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
index: -1, .index = -1,
}; };
int __init sab82532_console_init(void) int __init sab82532_console_init(void)
......
...@@ -2976,12 +2976,12 @@ static int __init serial_console_setup(struct console *co, char *options) ...@@ -2976,12 +2976,12 @@ static int __init serial_console_setup(struct console *co, char *options)
} }
static struct console sercons = { static struct console sercons = {
name: "ttyS", .name = "ttyS",
write: serial_console_write, .write = serial_console_write,
device: serial_console_device, .device = serial_console_device,
setup: serial_console_setup, .setup = serial_console_setup,
flags: CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
index: -1, .index = -1,
}; };
int su_console_registered = 0; int su_console_registered = 0;
......
...@@ -1548,12 +1548,12 @@ kbd_close (struct inode *i, struct file *f) ...@@ -1548,12 +1548,12 @@ kbd_close (struct inode *i, struct file *f)
static struct file_operations kbd_fops = static struct file_operations kbd_fops =
{ {
read: kbd_read, .read = kbd_read,
poll: kbd_poll, .poll = kbd_poll,
ioctl: kbd_ioctl, .ioctl = kbd_ioctl,
open: kbd_open, .open = kbd_open,
release: kbd_close, .release = kbd_close,
fasync: kbd_fasync, .fasync = kbd_fasync,
}; };
void __init keyboard_zsinit(void (*put_char)(unsigned char)) void __init keyboard_zsinit(void (*put_char)(unsigned char))
......
...@@ -587,13 +587,13 @@ sun_mouse_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsig ...@@ -587,13 +587,13 @@ sun_mouse_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsig
} }
struct file_operations sun_mouse_fops = { struct file_operations sun_mouse_fops = {
read: sun_mouse_read, .read = sun_mouse_read,
write: sun_mouse_write, .write = sun_mouse_write,
poll: sun_mouse_poll, .poll = sun_mouse_poll,
ioctl: sun_mouse_ioctl, .ioctl = sun_mouse_ioctl,
open: sun_mouse_open, .open = sun_mouse_open,
release: sun_mouse_close, .release = sun_mouse_close,
fasync: sun_mouse_fasync, .fasync = sun_mouse_fasync,
}; };
static struct miscdevice sun_mouse_mouse = { static struct miscdevice sun_mouse_mouse = {
......
...@@ -224,10 +224,10 @@ void uctrl_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -224,10 +224,10 @@ void uctrl_interrupt(int irq, void *dev_id, struct pt_regs *regs)
} }
static struct file_operations uctrl_fops = { static struct file_operations uctrl_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: no_llseek, .llseek = no_llseek,
ioctl: uctrl_ioctl, .ioctl = uctrl_ioctl,
open: uctrl_open, .open = uctrl_open,
}; };
static struct miscdevice uctrl_dev = { static struct miscdevice uctrl_dev = {
......
...@@ -643,12 +643,12 @@ static int vfc_mmap(struct inode *inode, struct file *file, ...@@ -643,12 +643,12 @@ static int vfc_mmap(struct inode *inode, struct file *file,
static struct file_operations vfc_fops = { static struct file_operations vfc_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: no_llseek, .llseek = no_llseek,
ioctl: vfc_ioctl, .ioctl = vfc_ioctl,
mmap: vfc_mmap, .mmap = vfc_mmap,
open: vfc_open, .open = vfc_open,
release: vfc_release, .release = vfc_release,
}; };
static int vfc_probe(void) static int vfc_probe(void)
......
...@@ -2869,12 +2869,12 @@ static int __init zs_console_setup(struct console *con, char *options) ...@@ -2869,12 +2869,12 @@ static int __init zs_console_setup(struct console *con, char *options)
} }
static struct console zs_console = { static struct console zs_console = {
name: "ttyS", .name = "ttyS",
write: zs_console_write, .write = zs_console_write,
device: zs_console_device, .device = zs_console_device,
setup: zs_console_setup, .setup = zs_console_setup,
flags: CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
index: -1, .index = -1,
}; };
static int __init zs_console_init(void) static int __init zs_console_init(void)
......
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