Commit aeac538d authored by Art Haas's avatar Art Haas Committed by Greg Kroah-Hartman

[PATCH] C99 initializers for drivers/hotplug

Here's a small set of patches for switching drivers/hotplug to use C99
initializers. The patches are against 2.5.49.
parent a515c2d5
...@@ -572,16 +572,16 @@ static int unconfigure_visit_pci_bus_phase2(struct pci_bus_wrapped *wrapped_bus, ...@@ -572,16 +572,16 @@ static int unconfigure_visit_pci_bus_phase2(struct pci_bus_wrapped *wrapped_bus,
} }
static struct pci_visit configure_functions = { static struct pci_visit configure_functions = {
visit_pci_dev:configure_visit_pci_dev, .visit_pci_dev = configure_visit_pci_dev,
}; };
static struct pci_visit unconfigure_functions_phase1 = { static struct pci_visit unconfigure_functions_phase1 = {
post_visit_pci_dev:unconfigure_visit_pci_dev_phase1 .post_visit_pci_dev = unconfigure_visit_pci_dev_phase1
}; };
static struct pci_visit unconfigure_functions_phase2 = { static struct pci_visit unconfigure_functions_phase2 = {
post_visit_pci_bus:unconfigure_visit_pci_bus_phase2, .post_visit_pci_bus = unconfigure_visit_pci_bus_phase2,
post_visit_pci_dev:unconfigure_visit_pci_dev_phase2 .post_visit_pci_dev = unconfigure_visit_pci_dev_phase2
}; };
......
...@@ -1240,11 +1240,11 @@ void ibmphp_free_ebda_pci_rsrc_queue (void) ...@@ -1240,11 +1240,11 @@ void ibmphp_free_ebda_pci_rsrc_queue (void)
static struct pci_device_id id_table[] __devinitdata = { static struct pci_device_id id_table[] __devinitdata = {
{ {
vendor: PCI_VENDOR_ID_IBM, .vendor = PCI_VENDOR_ID_IBM,
device: HPC_DEVICE_ID, .device = HPC_DEVICE_ID,
subvendor: PCI_VENDOR_ID_IBM, .subvendor = PCI_VENDOR_ID_IBM,
subdevice: HPC_SUBSYSTEM_ID, .subdevice = HPC_SUBSYSTEM_ID,
class: ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00), .class = ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00),
}, {} }, {}
}; };
...@@ -1252,9 +1252,9 @@ MODULE_DEVICE_TABLE(pci, id_table); ...@@ -1252,9 +1252,9 @@ MODULE_DEVICE_TABLE(pci, id_table);
static int ibmphp_probe (struct pci_dev *, const struct pci_device_id *); static int ibmphp_probe (struct pci_dev *, const struct pci_device_id *);
static struct pci_driver ibmphp_driver = { static struct pci_driver ibmphp_driver = {
name: "ibmphp", .name = "ibmphp",
id_table: id_table, .id_table = id_table,
probe: ibmphp_probe, .probe = ibmphp_probe,
}; };
int ibmphp_register_pci (void) int ibmphp_register_pci (void)
......
...@@ -319,19 +319,19 @@ static struct file_operations presence_file_operations = { ...@@ -319,19 +319,19 @@ static struct file_operations presence_file_operations = {
/* file ops for the "max bus speed" files */ /* file ops for the "max bus speed" files */
static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations max_bus_speed_file_operations = { static struct file_operations max_bus_speed_file_operations = {
read: max_bus_speed_read_file, .read = max_bus_speed_read_file,
write: default_write_file, .write = default_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "current bus speed" files */ /* file ops for the "current bus speed" files */
static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset); static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations cur_bus_speed_file_operations = { static struct file_operations cur_bus_speed_file_operations = {
read: cur_bus_speed_read_file, .read = cur_bus_speed_read_file,
write: default_write_file, .write = default_write_file,
open: default_open, .open = default_open,
llseek: default_file_lseek, .llseek = default_file_lseek,
}; };
/* file ops for the "test" files */ /* file ops for the "test" files */
......
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