[PATCH] drivers/hotplug designated initializers

 The old form of designated initializers are obsolete: we need to
 replace them with the ISO C forms before 2.6.  Gcc has always supported
 both forms anyway.

diff --git a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c
index 2828515838fc9020753914aecaf85b0dc3895b2b..f7b5a5b6930c647a080b87f53b2491a9e779b060 100644 (file)
--- a/drivers/hotplug/cpqphp_core.c
+++ b/drivers/hotplug/cpqphp_core.c
@@ -81,15 +81,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status  (struct hotplug_slot *slot, u8 *value);
 
 static struct hotplug_slot_ops cpqphp_hotplug_slot_ops = {
-       owner:                  THIS_MODULE,
-       set_attention_status:   set_attention_status,
-       enable_slot:            process_SI,
-       disable_slot:           process_SS,
-       hardware_test:          hardware_test,
-       get_power_status:       get_power_status,
-       get_attention_status:   get_attention_status,
-       get_latch_status:       get_latch_status,
-       get_adapter_status:     get_adapter_status,
+       .owner =                THIS_MODULE,
+       .set_attention_status = set_attention_status,
+       .enable_slot =          process_SI,
+       .disable_slot =         process_SS,
+       .hardware_test =        hardware_test,
+       .get_power_status =     get_power_status,
+       .get_attention_status = get_attention_status,
+       .get_latch_status =     get_latch_status,
+       .get_adapter_status =   get_adapter_status,
 };
 
 
@@ -1387,14 +1387,14 @@ static void unload_cpqphpd(void)
 static struct pci_device_id hpcd_pci_tbl[] __devinitdata = {
        {
        /* handle any PCI Hotplug controller */
-       class:          ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00),
-       class_mask:     ~0,
+       .class =        ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00),
+       .class_mask =   ~0,
        
        /* no matter who makes it */
-       vendor:         PCI_ANY_ID,
-       device:         PCI_ANY_ID,
-       subvendor:      PCI_ANY_ID,
-       subdevice:      PCI_ANY_ID,
+       .vendor =       PCI_ANY_ID,
+       .device =       PCI_ANY_ID,
+       .subvendor =    PCI_ANY_ID,
+       .subdevice =    PCI_ANY_ID,
        
        }, { /* end: all zeroes */ }
 };
@@ -1404,9 +1404,9 @@ MODULE_DEVICE_TABLE(pci, hpcd_pci_tbl);
 
 
 static struct pci_driver cpqhpc_driver = {
-       name:           "pci_hotplug",
-       id_table:       hpcd_pci_tbl,
-       probe:          cpqhpc_probe,
+       .name =         "pci_hotplug",
+       .id_table =     hpcd_pci_tbl,
+       .probe =        cpqhpc_probe,
        /* remove:      cpqhpc_remove_one, */
 };
 

diff --git a/drivers/hotplug/cpqphp_pci.c b/drivers/hotplug/cpqphp_pci.c
index 8c9c67201b1e7b885fb671f933ae7cc934a03cc4..d8c65c5af128005de771a12ae685531d82eaf81c 100644 (file)
--- a/drivers/hotplug/cpqphp_pci.c
+++ b/drivers/hotplug/cpqphp_pci.c
@@ -232,17 +232,17 @@ static int unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped_dev
 
 
 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 = {
-       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 = {
-       post_visit_pci_bus:     unconfigure_visit_pci_bus_phase2,               
-       post_visit_pci_dev:     unconfigure_visit_pci_dev_phase2
+       .post_visit_pci_bus =   unconfigure_visit_pci_bus_phase2,               
+       .post_visit_pci_dev =   unconfigure_visit_pci_dev_phase2
 };
 
 

diff --git a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c
index 05e092126a3e1df1bdf6554d584c7ff8c1ebdb33..87234e42f58e7a80b9e4b031f0a6df5ffaf1139b 100644 (file)
--- a/drivers/hotplug/ibmphp_core.c
+++ b/drivers/hotplug/ibmphp_core.c
@@ -893,12 +893,12 @@ static int ibm_unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped
 }
 
 static struct pci_visit ibm_unconfigure_functions_phase1 = {
-       post_visit_pci_dev:     ibm_unconfigure_visit_pci_dev_phase1,
+       .post_visit_pci_dev =   ibm_unconfigure_visit_pci_dev_phase1,
 };
 
 static struct pci_visit ibm_unconfigure_functions_phase2 = {
-       post_visit_pci_bus:     ibm_unconfigure_visit_pci_bus_phase2,
-       post_visit_pci_dev:     ibm_unconfigure_visit_pci_dev_phase2,
+       .post_visit_pci_bus =   ibm_unconfigure_visit_pci_bus_phase2,
+       .post_visit_pci_dev =   ibm_unconfigure_visit_pci_dev_phase2,
 };
 
 static int ibm_unconfigure_device (struct pci_func *func)
@@ -962,7 +962,7 @@ static int configure_visit_pci_dev (struct pci_dev_wrapped *wrapped_dev, struct
 }
 
 static struct pci_visit configure_functions = {
-       visit_pci_dev:  configure_visit_pci_dev,
+       .visit_pci_dev =configure_visit_pci_dev,
 };
 
 static int ibm_configure_device (struct pci_func *func)
@@ -1494,19 +1494,19 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
 }
 
 struct hotplug_slot_ops ibmphp_hotplug_slot_ops = {
-       owner:                          THIS_MODULE,
-       set_attention_status:           set_attention_status,
-       enable_slot:                    enable_slot,
-       disable_slot:                   ibmphp_disable_slot,
-       hardware_test:                  NULL,
-       get_power_status:               get_power_status,
-       get_attention_status:           get_attention_status,
-       get_latch_status:               get_latch_status,
-       get_adapter_status:             get_adapter_present,
+       .owner =                        THIS_MODULE,
+       .set_attention_status =         set_attention_status,
+       .enable_slot =                  enable_slot,
+       .disable_slot =                 ibmphp_disable_slot,
+       .hardware_test =                NULL,
+       .get_power_status =             get_power_status,
+       .get_attention_status =         get_attention_status,
+       .get_latch_status =             get_latch_status,
+       .get_adapter_status =           get_adapter_present,
 /*     get_max_bus_speed_status:       get_max_bus_speed,
-       get_max_adapter_speed_status:   get_max_adapter_speed,
-       get_cur_bus_speed_status:       get_cur_bus_speed,
-       get_card_bus_names_status:      get_card_bus_names,
+       .get_max_adapter_speed_status = get_max_adapter_speed,
+       .get_cur_bus_speed_status =     get_cur_bus_speed,
+       .get_card_bus_names_status =    get_card_bus_names,
 */
 };
 

diff --git a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
index 6e1833ae9cc76a8575e1ebddc470e56c891575a1..15bc11a842c8da183f38c941b293923f639b4d59 100644 (file)
--- a/drivers/hotplug/pci_hotplug_core.c
+++ b/drivers/hotplug/pci_hotplug_core.c
@@ -230,71 +230,71 @@ static int default_open (struct inode *inode, struct file *filp)
 }
 
 static struct file_operations default_file_operations = {
-       read:           default_read_file,
-       write:          default_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         default_read_file,
+       .write =        default_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 /* file ops for the "power" files */
 static ssize_t power_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
 static ssize_t power_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
 static struct file_operations power_file_operations = {
-       read:           power_read_file,
-       write:          power_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         power_read_file,
+       .write =        power_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 /* file ops for the "attention" files */
 static ssize_t attention_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
 static ssize_t attention_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
 static struct file_operations attention_file_operations = {
-       read:           attention_read_file,
-       write:          attention_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         attention_read_file,
+       .write =        attention_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 /* file ops for the "latch" files */
 static ssize_t latch_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
 static struct file_operations latch_file_operations = {
-       read:           latch_read_file,
-       write:          default_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         latch_read_file,
+       .write =        default_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 /* file ops for the "presence" files */
 static ssize_t presence_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
 static struct file_operations presence_file_operations = {
-       read:           presence_read_file,
-       write:          default_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         presence_read_file,
+       .write =        default_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 /* file ops for the "test" files */
 static ssize_t test_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
 static struct file_operations test_file_operations = {
-       read:           default_read_file,
-       write:          test_write_file,
-       open:           default_open,
-       llseek:         default_file_lseek,
+       .read =         default_read_file,
+       .write =        test_write_file,
+       .open =         default_open,
+       .llseek =       default_file_lseek,
 };
 
 static struct inode_operations pcihpfs_dir_inode_operations = {
-       create:         pcihpfs_create,
-       lookup:         simple_lookup,
-       unlink:         pcihpfs_unlink,
-       mkdir:          pcihpfs_mkdir,
-       rmdir:          pcihpfs_rmdir,
-       mknod:          pcihpfs_mknod,
+       .create =       pcihpfs_create,
+       .lookup =       simple_lookup,
+       .unlink =       pcihpfs_unlink,
+       .mkdir =        pcihpfs_mkdir,
+       .rmdir =        pcihpfs_rmdir,
+       .mknod =        pcihpfs_mknod,
 };
 
 static struct super_operations pcihpfs_ops = {
-       statfs:         simple_statfs,
-       drop_inode:     generic_delete_inode,
+       .statfs =       simple_statfs,
+       .drop_inode =   generic_delete_inode,
 };
 
 static int pcihpfs_fill_super(struct super_block *sb, void *data, int silent)
@@ -330,10 +330,10 @@ static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type,
 }
 
 static struct file_system_type pcihpfs_type = {
-       owner:          THIS_MODULE,
-       name:           "pcihpfs",
-       get_sb:         pcihpfs_get_sb,
-       kill_sb:        kill_litter_super,
+       .owner =        THIS_MODULE,
+       .name =         "pcihpfs",
+       .get_sb =       pcihpfs_get_sb,
+       .kill_sb =      kill_litter_super,
 };
 
 static int get_mount (void)

diff --git a/drivers/hotplug/pcihp_skeleton.c b/drivers/hotplug/pcihp_skeleton.c
index 3a7bc21f58a906ebfd44e97c3f1441f96186de2d..9f5dbe731a153f44c3d17512a7def99087b6f4f4 100644 (file)
--- a/drivers/hotplug/pcihp_skeleton.c
+++ b/drivers/hotplug/pcihp_skeleton.c
@@ -89,15 +89,15 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status  (struct hotplug_slot *slot, u8 *value);
 
 static struct hotplug_slot_ops skel_hotplug_slot_ops = {
-       owner:                  THIS_MODULE,
-       enable_slot:            enable_slot,
-       disable_slot:           disable_slot,
-       set_attention_status:   set_attention_status,
-       hardware_test:          hardware_test,
-       get_power_status:       get_power_status,
-       get_attention_status:   get_attention_status,
-       get_latch_status:       get_latch_status,
-       get_adapter_status:     get_adapter_status,
+       .owner =                THIS_MODULE,
+       .enable_slot =          enable_slot,
+       .disable_slot =         disable_slot,
+       .set_attention_status = set_attention_status,
+       .hardware_test =        hardware_test,
+       .get_power_status =     get_power_status,
+       .get_attention_status = get_attention_status,
+       .get_latch_status =     get_latch_status,
+       .get_adapter_status =   get_adapter_status,
 };