[PATCH] Designated initializers for i386

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/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index f9c0a57b36b91d8b82334cd35688dd7da0ceca12..2b3f4d17b791152b90a34ba4e649948d90103fa9 100644 (file)
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -945,9 +945,9 @@ static void handle_poweroff (int key, struct pt_regs *pt_regs,
 }
 
 static struct sysrq_key_op     sysrq_poweroff_op = {
-       handler:        handle_poweroff,
-       help_msg:       "Off",
-       action_msg:     "Power Off\n"
+       .handler        = handle_poweroff,
+       .help_msg       = "Off",
+       .action_msg     = "Power Off\n"
 };
 
 
@@ -1840,12 +1840,12 @@ __setup("apm=", apm_setup);
 #endif
 
 static struct file_operations apm_bios_fops = {
-       owner:          THIS_MODULE,
-       read:           do_read,
-       poll:           do_poll,
-       ioctl:          do_ioctl,
-       open:           do_open,
-       release:        do_release,
+       .owner          = THIS_MODULE,
+       .read           = do_read,
+       .poll           = do_poll,
+       .ioctl          = do_ioctl,
+       .open           = do_open,
+       .release        = do_release,
 };
 
 static struct miscdevice apm_device = {

diff --git a/arch/i386/kernel/bluesmoke.c b/arch/i386/kernel/bluesmoke.c
index e57644c66229448ba4a8816084d98b72b3d6afa8..a6e685b12f8b9158f874551ebbb4a661a03d70f0 100644 (file)
--- a/arch/i386/kernel/bluesmoke.c
+++ b/arch/i386/kernel/bluesmoke.c
@@ -307,7 +307,7 @@ static void do_mce_timer(void *data)
 } 
 
 static struct tq_struct mce_task = { 
-       routine: do_mce_timer   
+       .routine = do_mce_timer 
 };
 
 static void mce_timerfunc (unsigned long data)

diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index 23b42fc639413c50c04a1b5f33f58bb9fb728b89..9c7f94037fdaa342ed7f4926c4712b8b3301507f 100644 (file)
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -189,8 +189,8 @@ static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
 }
 
 static struct cpu_dev amd_cpu_dev __initdata = {
-       c_vendor:       "AMD",
-       c_ident:        { "AuthenticAMD" },
+       .c_vendor       = "AMD",
+       .c_ident        = { "AuthenticAMD" },
        c_models: {
                { X86_VENDOR_AMD,       4,
                  {
@@ -203,9 +203,9 @@ static struct cpu_dev amd_cpu_dev __initdata = {
                  }
                },
        },
-       c_init:         init_amd,
-       c_identify:     amd_identify,
-       c_size_cache:   amd_size_cache,
+       .c_init         = init_amd,
+       .c_identify     = amd_identify,
+       .c_size_cache   = amd_size_cache,
 };
 
 int __init amd_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/centaur.c b/arch/i386/kernel/cpu/centaur.c
index e5bd1bebc4b0e5ed0c3466200f26a7895fb22b1a..a59806babec7db6cde514aff90a6268225b9502a 100644 (file)
--- a/arch/i386/kernel/cpu/centaur.c
+++ b/arch/i386/kernel/cpu/centaur.c
@@ -411,10 +411,10 @@ static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size
 }
 
 static struct cpu_dev centaur_cpu_dev __initdata = {
-       c_vendor:       "Centaur",
-       c_ident:        { "CentaurHauls" },
-       c_init:         init_centaur,
-       c_size_cache:   centaur_size_cache,
+       .c_vendor       = "Centaur",
+       .c_ident        = { "CentaurHauls" },
+       .c_init         = init_centaur,
+       .c_size_cache   = centaur_size_cache,
 };
 
 int __init centaur_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index cf90d41aba424d918565a6f8fdb4ae4362ddbf15..35b2fea4d03d2bfe5138650f9391cb13d705b24a 100644 (file)
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -31,7 +31,7 @@ static void default_init(struct cpuinfo_x86 * c)
 }
 
 static struct cpu_dev default_cpu = {
-       c_init: default_init,
+       .c_init = default_init,
 };
 static struct cpu_dev * this_cpu = &default_cpu;
 

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index d9d3771b428dbd005d6062100b8570358dc7f1f5..572889eed255b209488edc1d81d86c3277d4fcd0 100644 (file)
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -322,10 +322,10 @@ static void cyrix_identify(struct cpuinfo_x86 * c)
 }
 
 static struct cpu_dev cyrix_cpu_dev __initdata = {
-       c_vendor:       "Cyrix",
-       c_ident:        { "CyrixInstead" },
-       c_init:         init_cyrix,
-       c_identify:     cyrix_identify,
+       .c_vendor       = "Cyrix",
+       .c_ident        = { "CyrixInstead" },
+       .c_init         = init_cyrix,
+       .c_identify     = cyrix_identify,
 };
 
 int __init cyrix_init_cpu(void)
@@ -337,10 +337,10 @@ int __init cyrix_init_cpu(void)
 //early_arch_initcall(cyrix_init_cpu);
 
 static struct cpu_dev nsc_cpu_dev __initdata = {
-       c_vendor:       "NSC",
-       c_ident:        { "Geode by NSC" },
-       c_init:         init_cyrix,
-       c_identify:     generic_identify,
+       .c_vendor       = "NSC",
+       .c_ident        = { "Geode by NSC" },
+       .c_init         = init_cyrix,
+       .c_identify     = generic_identify,
 };
 
 int __init nsc_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c
index 636e88762ef178d676eb09e1070a01bb7485000d..ff98d996d336653b3b79c42ce2bef7d81cb31597 100644 (file)
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
@@ -327,8 +327,8 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
 }
 
 static struct cpu_dev intel_cpu_dev __initdata = {
-       c_vendor:       "Intel",
-       c_ident:        { "GenuineIntel" },
+       .c_vendor       = "Intel",
+       .c_ident        = { "GenuineIntel" },
        c_models: {
                { X86_VENDOR_INTEL,     4,
                  { 
@@ -375,9 +375,9 @@ static struct cpu_dev intel_cpu_dev __initdata = {
                  }
                },
        },
-       c_init:         init_intel,
-       c_identify:     generic_identify,
-       c_size_cache:   intel_size_cache,
+       .c_init         = init_intel,
+       .c_identify     = generic_identify,
+       .c_size_cache   = intel_size_cache,
 };
 
 __init int intel_cpu_init(void)

diff --git a/arch/i386/kernel/cpu/nexgen.c b/arch/i386/kernel/cpu/nexgen.c
index 487e9e795d79737f7e3f485d4dc7081ae6f98f90..18da763a4fc985438a3ad852354dd9cb49239778 100644 (file)
--- a/arch/i386/kernel/cpu/nexgen.c
+++ b/arch/i386/kernel/cpu/nexgen.c
@@ -42,13 +42,13 @@ static void nexgen_identify(struct cpuinfo_x86 * c)
 }
 
 static struct cpu_dev nexgen_cpu_dev __initdata = {
-       c_vendor:       "Nexgen",
-       c_ident:        { "NexGenDriven" },
+       .c_vendor       = "Nexgen",
+       .c_ident        = { "NexGenDriven" },
        c_models: {
                { X86_VENDOR_NEXGEN,5, { [1] "Nx586" } },
        },
-       c_init:         init_nexgen,
-       c_identify:     nexgen_identify,
+       .c_init         = init_nexgen,
+       .c_identify     = nexgen_identify,
 };
 
 int __init nexgen_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 570affdb1f0c810a789a11d5b5b107e92ed1d9cd..4788021a9a1bdb30c49490beb266891cbac92ced 100644 (file)
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -119,8 +119,8 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 struct seq_operations cpuinfo_op = {
-       start:  c_start,
-       next:   c_next,
-       stop:   c_stop,
-       show:   show_cpuinfo,
+       .start  = c_start,
+       .next   = c_next,
+       .stop   = c_stop,
+       .show   = show_cpuinfo,
 };

diff --git a/arch/i386/kernel/cpu/rise.c b/arch/i386/kernel/cpu/rise.c
index e56935319bba39a0bb2824abaab6d4cb99ae1808..19b420e2d5f1eb16573f726a713894b06834ad19 100644 (file)
--- a/arch/i386/kernel/cpu/rise.c
+++ b/arch/i386/kernel/cpu/rise.c
@@ -29,8 +29,8 @@ static void __init init_rise(struct cpuinfo_x86 *c)
 }
 
 static struct cpu_dev rise_cpu_dev __initdata = {
-       c_vendor:       "Rise",
-       c_ident:        { "RiseRiseRise" },
+       .c_vendor       = "Rise",
+       .c_ident        = { "RiseRiseRise" },
        c_models: {
                { X86_VENDOR_RISE,      5,
                  { 
@@ -41,7 +41,7 @@ static struct cpu_dev rise_cpu_dev __initdata = {
                  }
                },
        },
-       c_init:         init_rise,
+       .c_init         = init_rise,
 };
 
 int __init rise_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/transmeta.c b/arch/i386/kernel/cpu/transmeta.c
index 3fe5124e438fdecaab989962e14432236afa640d..2314da6f8421370bce34dda43df9fbd0cebee69b 100644 (file)
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/i386/kernel/cpu/transmeta.c
@@ -80,10 +80,10 @@ static void transmeta_identify(struct cpuinfo_x86 * c)
 }
 
 static struct cpu_dev transmeta_cpu_dev __initdata = {
-       c_vendor:       "Transmeta",
-       c_ident:        { "GenuineTMx86", "TransmetaCPU" },
-       c_init:         init_transmeta,
-       c_identify:     transmeta_identify,
+       .c_vendor       = "Transmeta",
+       .c_ident        = { "GenuineTMx86", "TransmetaCPU" },
+       .c_init         = init_transmeta,
+       .c_identify     = transmeta_identify,
 };
 
 int __init transmeta_init_cpu(void)

diff --git a/arch/i386/kernel/cpu/umc.c b/arch/i386/kernel/cpu/umc.c
index a99545811457e4414526f9f867e6d0b816df02eb..ae8eed32e9826b28c67044508c2fdc280da346f8 100644 (file)
--- a/arch/i386/kernel/cpu/umc.c
+++ b/arch/i386/kernel/cpu/umc.c
@@ -11,8 +11,8 @@ static void __init init_umc(struct cpuinfo_x86 * c)
 }
 
 static struct cpu_dev umc_cpu_dev __initdata = {
-       c_vendor:       "UMC",
-       c_ident:        { "UMC UMC UMC" },
+       .c_vendor       = "UMC",
+       .c_ident        = { "UMC UMC UMC" },
        c_models: {
                { X86_VENDOR_UMC,       4,
                  { 
@@ -21,7 +21,7 @@ static struct cpu_dev umc_cpu_dev __initdata = {
                  }
                },
        },
-       c_init:         init_umc,
+       .c_init         = init_umc,
 };
 
 int __init umc_init_cpu(void)

diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 546f83f03f0fa84d30517ac90ac9165c94f51aaa..871c21a29b1e126435aac617d4320b721bed12be 100644 (file)
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -146,10 +146,10 @@ static int cpuid_open(struct inode *inode, struct file *file)
  * File operations we support
  */
 static struct file_operations cpuid_fops = {
-  owner:       THIS_MODULE,
-  llseek:      cpuid_seek,
-  read:                cpuid_read,
-  open:                cpuid_open,
+  .owner       = THIS_MODULE,
+  .llseek      = cpuid_seek,
+  .read                = cpuid_read,
+  .open                = cpuid_open,
 };
 
 int __init cpuid_init(void)

diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index 6e875d22283fc95c89f88c960df3b42bde99936a..4f7a5472eb1c096d092e5e5324a1b1186b20780c 100644 (file)
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -247,13 +247,13 @@ static int i8259A_resume(struct device *dev, u32 level)
 }
 
 static struct device_driver driver_i8259A = {
-       resume:         i8259A_resume,
+       .resume         = i8259A_resume,
 };
 
 static struct device device_i8259A = {
-       name:           "i8259A",
-       bus_id:         "0020",
-       driver:         &driver_i8259A,
+       .name           = "i8259A",
+       .bus_id         = "0020",
+       .driver         = &driver_i8259A,
 };
 
 static int __init init_8259A_devicefs(void)

diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 0e2577f00d2c35b120d17c3795e69ed71c7d6716..ccdebea647331b7ba00d5c27c7369edcbfff97eb 100644 (file)
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -109,17 +109,17 @@ static unsigned int mc_fsize;       /* file size of /dev/cpu/microcode */
 
 /* we share file_operations between misc and devfs mechanisms */
 static struct file_operations microcode_fops = {
-       owner:          THIS_MODULE,
-       read:           microcode_read,
-       write:          microcode_write,
-       ioctl:          microcode_ioctl,
-       open:           microcode_open,
+       .owner          = THIS_MODULE,
+       .read           = microcode_read,
+       .write          = microcode_write,
+       .ioctl          = microcode_ioctl,
+       .open           = microcode_open,
 };
 
 static struct miscdevice microcode_dev = {
-       minor: MICROCODE_MINOR,
-       name:   "microcode",
-       fops:   &microcode_fops,
+       .minor = MICROCODE_MINOR,
+       .name   = "microcode",
+       .fops   = &microcode_fops,
 };
 
 static devfs_handle_t devfs_handle;

diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index e125a183e33cccfa92de4fdd05c745f6dd02f652..5ad97d4a10c3626cabaac30f38cfb0a2ea999049 100644 (file)
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -246,11 +246,11 @@ static int msr_open(struct inode *inode, struct file *file)
  * File operations we support
  */
 static struct file_operations msr_fops = {
-  owner:       THIS_MODULE,
-  llseek:      msr_seek,
-  read:                msr_read,
-  write:       msr_write,
-  open:                msr_open,
+  .owner       = THIS_MODULE,
+  .llseek      = msr_seek,
+  .read                = msr_read,
+  .write       = msr_write,
+  .open                = msr_open,
 };
 
 int __init msr_init(void)

diff --git a/arch/i386/kernel/mtrr.c b/arch/i386/kernel/mtrr.c
index c17e01b48bab36b0305988f68c7a31dca65a4681..79e925e8c59a217053fe0877f197b569bf78d33a 100644 (file)
--- a/arch/i386/kernel/mtrr.c
+++ b/arch/i386/kernel/mtrr.c
@@ -1836,11 +1836,11 @@ static int mtrr_close (struct inode *ino, struct file *file)
 
 static struct file_operations mtrr_fops =
 {
-    owner:     THIS_MODULE,
-    read:      mtrr_read,
-    write:     mtrr_write,
-    ioctl:     mtrr_ioctl,
-    release:   mtrr_close,
+    .owner     = THIS_MODULE,
+    .read      = mtrr_read,
+    .write     = mtrr_write,
+    .ioctl     = mtrr_ioctl,
+    .release   = mtrr_close,
 };
 
 #  ifdef CONFIG_PROC_FS

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index f562515135818e4bbb7c53f621230fe3c3a478e2..a32314075d1db77aa3e1434497d8e13fecabe0f2 100644 (file)
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -639,8 +639,8 @@ bad_ctc:
 }
 
 static struct device device_i8253 = {
-       name:           "i8253",
-       bus_id:         "0040",
+       .name           = "i8253",
+       .bus_id         = "0040",
 };
 
 static int time_init_driverfs(void)