Commit baf8febe authored by Art Haas's avatar Art Haas Committed by Andy Grover

[PATCH] C99 designated initializers for drivers/macintosh

parent 1ca97ab9
...@@ -837,11 +837,11 @@ static ssize_t adb_write(struct file *file, const char *buf, ...@@ -837,11 +837,11 @@ static ssize_t adb_write(struct file *file, const char *buf,
} }
static struct file_operations adb_fops = { static struct file_operations adb_fops = {
llseek: no_llseek, .llseek = no_llseek,
read: adb_read, .read = adb_read,
write: adb_write, .write = adb_write,
open: adb_open, .open = adb_open,
release: adb_release, .release = adb_release,
}; };
static void static void
......
...@@ -55,7 +55,7 @@ extern struct pt_regs *kbd_pt_regs; ...@@ -55,7 +55,7 @@ extern struct pt_regs *kbd_pt_regs;
static int adb_message_handler(struct notifier_block *, unsigned long, void *); static int adb_message_handler(struct notifier_block *, unsigned long, void *);
static struct notifier_block adbhid_adb_notifier = { static struct notifier_block adbhid_adb_notifier = {
notifier_call: adb_message_handler, .notifier_call = adb_message_handler,
}; };
unsigned char adb_to_linux_keycodes[128] = { unsigned char adb_to_linux_keycodes[128] = {
......
...@@ -120,9 +120,9 @@ anslcd_open( struct inode * inode, struct file * file ) ...@@ -120,9 +120,9 @@ anslcd_open( struct inode * inode, struct file * file )
} }
struct file_operations anslcd_fops = { struct file_operations anslcd_fops = {
write: anslcd_write, .write = anslcd_write,
ioctl: anslcd_ioctl, .ioctl = anslcd_ioctl,
open: anslcd_open, .open = anslcd_open,
}; };
static struct miscdevice anslcd_dev = { static struct miscdevice anslcd_dev = {
......
...@@ -499,12 +499,12 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length) ...@@ -499,12 +499,12 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
} }
static struct file_operations apm_bios_fops = { static struct file_operations apm_bios_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: do_read, .read = do_read,
poll: do_poll, .poll = do_poll,
ioctl: do_ioctl, .ioctl = do_ioctl,
open: do_open, .open = do_open,
release: do_release, .release = do_release,
}; };
static struct miscdevice apm_device = { static struct miscdevice apm_device = {
......
...@@ -3032,12 +3032,12 @@ static int __init serial_console_setup(struct console *co, char *options) ...@@ -3032,12 +3032,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,
}; };
/* /*
......
...@@ -706,30 +706,30 @@ mb_notify_sleep(struct pmu_sleep_notifier *self, int when) ...@@ -706,30 +706,30 @@ mb_notify_sleep(struct pmu_sleep_notifier *self, int when)
/* Definitions of "ops" structures. /* Definitions of "ops" structures.
*/ */
static struct mb_ops ohare_mb_ops __pmacdata = { static struct mb_ops ohare_mb_ops __pmacdata = {
name: "Ohare", .name = "Ohare",
content: ohare_mb_content, .content = ohare_mb_content,
power: ohare_mb_power, .power = ohare_mb_power,
setup_bus: ohare_mb_setup_bus, .setup_bus = ohare_mb_setup_bus,
un_reset: ohare_mb_un_reset, .un_reset = ohare_mb_un_reset,
un_reset_ide: ohare_mb_un_reset_ide, .un_reset_ide = ohare_mb_un_reset_ide,
}; };
static struct mb_ops heathrow_mb_ops __pmacdata = { static struct mb_ops heathrow_mb_ops __pmacdata = {
name: "Heathrow", .name = "Heathrow",
content: heathrow_mb_content, .content = heathrow_mb_content,
power: heathrow_mb_power, .power = heathrow_mb_power,
setup_bus: heathrow_mb_setup_bus, .setup_bus = heathrow_mb_setup_bus,
un_reset: heathrow_mb_un_reset, .un_reset = heathrow_mb_un_reset,
un_reset_ide: heathrow_mb_un_reset_ide, .un_reset_ide = heathrow_mb_un_reset_ide,
}; };
static struct mb_ops keylargo_mb_ops __pmacdata = { static struct mb_ops keylargo_mb_ops __pmacdata = {
name: "KeyLargo", .name = "KeyLargo",
content: keylargo_mb_content, .content = keylargo_mb_content,
power: keylargo_mb_power, .power = keylargo_mb_power,
setup_bus: keylargo_mb_setup_bus, .setup_bus = keylargo_mb_setup_bus,
un_reset: keylargo_mb_un_reset, .un_reset = keylargo_mb_un_reset,
un_reset_ide: keylargo_mb_un_reset_ide, .un_reset_ide = keylargo_mb_un_reset_ide,
}; };
/* /*
......
...@@ -101,11 +101,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file, ...@@ -101,11 +101,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
} }
struct file_operations nvram_fops = { struct file_operations nvram_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: nvram_llseek, .llseek = nvram_llseek,
read: read_nvram, .read = read_nvram,
write: write_nvram, .write = write_nvram,
ioctl: nvram_ioctl, .ioctl = nvram_ioctl,
}; };
static struct miscdevice nvram_dev = { static struct miscdevice nvram_dev = {
......
...@@ -2688,12 +2688,12 @@ static int pmu_ioctl(struct inode * inode, struct file *filp, ...@@ -2688,12 +2688,12 @@ static int pmu_ioctl(struct inode * inode, struct file *filp,
} }
static struct file_operations pmu_device_fops = { static struct file_operations pmu_device_fops = {
read: pmu_read, .read = pmu_read,
write: pmu_write, .write = pmu_write,
poll: pmu_fpoll, .poll = pmu_fpoll,
ioctl: pmu_ioctl, .ioctl = pmu_ioctl,
open: pmu_open, .open = pmu_open,
release: pmu_release, .release = pmu_release,
}; };
static struct miscdevice pmu_device = { static struct miscdevice pmu_device = {
......
...@@ -1040,10 +1040,10 @@ static int /*__openfirmware*/ pmu_ioctl(struct inode * inode, struct file *filp, ...@@ -1040,10 +1040,10 @@ static int /*__openfirmware*/ pmu_ioctl(struct inode * inode, struct file *filp,
} }
static struct file_operations pmu_device_fops = { static struct file_operations pmu_device_fops = {
read: pmu_read, .read = pmu_read,
write: pmu_write, .write = pmu_write,
ioctl: pmu_ioctl, .ioctl = pmu_ioctl,
open: pmu_open, .open = pmu_open,
}; };
static struct miscdevice pmu_device = { static struct miscdevice pmu_device = {
......
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