[PATCH] C99 designated initializers for arch/i386

arch/i386/kernel/cpu/amd.c

@@ -188,15 +188,15 @@ 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_models: {
-		{ X86_VENDOR_AMD,	4,
+	.c_models = {
+		{ .vendor = X86_VENDOR_AMD, .family = 4, .model_names =
 		  {
-			  [3] "486 DX/2",
-			  [7] "486 DX/2-WB",
-			  [8] "486 DX/4", 
-			  [9] "486 DX/4-WB", 
-			  [14] "Am5x86-WT",
-			  [15] "Am5x86-WB" 
+			  [3] = "486 DX/2",
+			  [7] = "486 DX/2-WB",
+			  [8] = "486 DX/4", 
+			  [9] = "486 DX/4-WB", 
+			  [14] = "Am5x86-WT",
+			  [15] = "Am5x86-WB" 
 		  }
 		},
 	},

arch/i386/kernel/cpu/intel.c

@@ -392,52 +392,52 @@ 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_models: {
-		{ X86_VENDOR_INTEL,	4,
+	.c_models = {
+		{ .vendor = X86_VENDOR_INTEL, .family = 4, .model_names = 
 		  { 
-			  [0] "486 DX-25/33", 
-			  [1] "486 DX-50", 
-			  [2] "486 SX", 
-			  [3] "486 DX/2", 
-			  [4] "486 SL", 
-			  [5] "486 SX/2", 
-			  [7] "486 DX/2-WB", 
-			  [8] "486 DX/4", 
-			  [9] "486 DX/4-WB"
+			  [0] = "486 DX-25/33", 
+			  [1] = "486 DX-50", 
+			  [2] = "486 SX", 
+			  [3] = "486 DX/2", 
+			  [4] = "486 SL", 
+			  [5] = "486 SX/2", 
+			  [7] = "486 DX/2-WB", 
+			  [8] = "486 DX/4", 
+			  [9] = "486 DX/4-WB"
 		  }
 		},
-		{ X86_VENDOR_INTEL,	5,
+		{ .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
 		  { 
-			  [0] "Pentium 60/66 A-step", 
-			  [1] "Pentium 60/66", 
-			  [2] "Pentium 75 - 200",
-			  [3] "OverDrive PODP5V83", 
-			  [4] "Pentium MMX",
-			  [7] "Mobile Pentium 75 - 200", 
-			  [8] "Mobile Pentium MMX"
+			  [0] = "Pentium 60/66 A-step", 
+			  [1] = "Pentium 60/66", 
+			  [2] = "Pentium 75 - 200",
+			  [3] = "OverDrive PODP5V83", 
+			  [4] = "Pentium MMX",
+			  [7] = "Mobile Pentium 75 - 200", 
+			  [8] = "Mobile Pentium MMX"
 		  }
 		},
-		{ X86_VENDOR_INTEL,     6,
+		{ .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
 		  { 
-			  [0] "Pentium Pro A-step",
-			  [1] "Pentium Pro", 
-			  [3] "Pentium II (Klamath)", 
-			  [4] "Pentium II (Deschutes)", 
-			  [5] "Pentium II (Deschutes)", 
-			  [6] "Mobile Pentium II",
-			  [7] "Pentium III (Katmai)", 
-			  [8] "Pentium III (Coppermine)", 
-			  [10] "Pentium III (Cascades)",
-			  [11] "Pentium III (Tualatin)",
+			  [0] = "Pentium Pro A-step",
+			  [1] = "Pentium Pro", 
+			  [3] = "Pentium II (Klamath)", 
+			  [4] = "Pentium II (Deschutes)", 
+			  [5] = "Pentium II (Deschutes)", 
+			  [6] = "Mobile Pentium II",
+			  [7] = "Pentium III (Katmai)", 
+			  [8] = "Pentium III (Coppermine)", 
+			  [10] = "Pentium III (Cascades)",
+			  [11] = "Pentium III (Tualatin)",
 		  }
 		},
-		{ X86_VENDOR_INTEL,     15,
+		{ .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
 		  {
-			  [0] "Pentium 4 (Unknown)",
-			  [1] "Pentium 4 (Willamette)",
-			  [2] "Pentium 4 (Northwood)",
-			  [4] "Pentium 4 (Foster)",
-			  [5] "Pentium 4 (Foster)",
+			  [0] = "Pentium 4 (Unknown)",
+			  [1] = "Pentium 4 (Willamette)",
+			  [2] = "Pentium 4 (Northwood)",
+			  [4] = "Pentium 4 (Foster)",
+			  [5] = "Pentium 4 (Foster)",
 		  }
 		},
 	},

arch/i386/kernel/cpu/nexgen.c

@@ -44,8 +44,11 @@ static void nexgen_identify(struct cpuinfo_x86 * c)
 static struct cpu_dev nexgen_cpu_dev __initdata = {
 	.c_vendor	= "Nexgen",
 	.c_ident	= { "NexGenDriven" },
-	c_models: {
-		{ X86_VENDOR_NEXGEN,5, { [1] "Nx586" } },
+	.c_models = {
+			{ .vendor = X86_VENDOR_NEXGEN,
+			  .family = 5,
+			  .model_names = { [1] = "Nx586" }
+			},
 	},
 	.c_init		= init_nexgen,
 	.c_identify	= nexgen_identify,

arch/i386/kernel/cpu/rise.c

@@ -31,13 +31,13 @@ static void __init init_rise(struct cpuinfo_x86 *c)
 static struct cpu_dev rise_cpu_dev __initdata = {
 	.c_vendor	= "Rise",
 	.c_ident	= { "RiseRiseRise" },
-	c_models: {
-		{ X86_VENDOR_RISE,	5,
+	.c_models = {
+		{ .vendor = X86_VENDOR_RISE, .family = 5, .model_names = 
 		  { 
-			  [0] "iDragon", 
-			  [2] "iDragon", 
-			  [8] "iDragon II", 
-			  [9] "iDragon II"
+			  [0] = "iDragon", 
+			  [2] = "iDragon", 
+			  [8] = "iDragon II", 
+			  [9] = "iDragon II"
 		  }
 		},
 	},

arch/i386/kernel/cpu/umc.c

@@ -13,11 +13,11 @@ 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_models: {
-		{ X86_VENDOR_UMC,	4,
+	.c_models = {
+		{ .vendor = X86_VENDOR_UMC, .family = 4, .model_names =
 		  { 
-			  [1] "U5D", 
-			  [2] "U5S", 
+			  [1] = "U5D", 
+			  [2] = "U5S", 
 		  }
 		},
 	},

arch/i386/kernel/timers/timer_tsc.c

@@ -224,7 +224,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 }
 
 static struct notifier_block time_cpufreq_notifier_block = {
-	notifier_call:	time_cpufreq_notifier
+	.notifier_call	= time_cpufreq_notifier
 };
 #endif
 

arch/i386/pci/numa.c

@@ -84,8 +84,8 @@ static int pci_conf1_mq_write(struct pci_bus *bus, unsigned int devfn, int where
 }
 
 static struct pci_ops pci_direct_conf1_mq = {
-	read:	pci_conf1_mq_read,
-	write:	pci_conf1_mq_write
+	.read	= pci_conf1_mq_read,
+	.write	= pci_conf1_mq_write
 };