Skip to contentSkip to conversation

C99 designated initializers for arch/i386

PATCH In review Art Haas 2 participants 2 messages Oct 12, 2002

lore
Share & tools
lore

Art Haas

author
#0 lore raw

PATCH 1/1 C99 designated initializers for arch/i386

Hi.

Here's a set of patches that switch arch/i386 to use C99 named initiailzers. The patches are all against 2.5.42.

Art Haas

arch/i386/kernel/cpu/intel.c renamed from arch/i386/kernel/cpu/intel.c.old +1 -1
@@ -366,7 +366,7 @@
 static struct cpu_dev intel_cpu_dev __initdata = {
 	.c_vendor	= "Intel",
 	.c_ident 	= { "GenuineIntel" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_INTEL,	4,
 		  { 
 			  [0] "486 DX-25/33",
arch/i386/kernel/cpu/rise.c renamed from arch/i386/kernel/cpu/rise.c.old +1 -1
@@ -31,7 +31,7 @@
 static struct cpu_dev rise_cpu_dev __initdata = {
 	.c_vendor	= "Rise",
 	.c_ident	= { "RiseRiseRise" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_RISE,	5,
 		  { 
 			  [0] "iDragon",
arch/i386/kernel/cpu/umc.c renamed from arch/i386/kernel/cpu/umc.c.old +1 -1
@@ -13,7 +13,7 @@
 static struct cpu_dev umc_cpu_dev __initdata = {
 	.c_vendor	= "UMC",
 	.c_ident 	= { "UMC UMC UMC" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_UMC,	4,
 		  { 
 			  [1] "U5D",
arch/i386/kernel/cpu/nexgen.c renamed from arch/i386/kernel/cpu/nexgen.c.old +1 -1
@@ -44,7 +44,7 @@
 static struct cpu_dev nexgen_cpu_dev __initdata = {
 	.c_vendor	= "Nexgen",
 	.c_ident	= { "NexGenDriven" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_NEXGEN,5, { [1] "Nx586" } },
 	},
 	.c_init		= init_nexgen,
arch/i386/kernel/cpu/amd.c renamed from arch/i386/kernel/cpu/amd.c.old +1 -1
@@ -173,7 +173,7 @@
 static struct cpu_dev amd_cpu_dev __initdata = {
 	.c_vendor	= "AMD",
 	.c_ident 	= { "AuthenticAMD" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_AMD,	4,
 		  {
 			  [3] "486 DX/2",
arch/i386/kernel/time.c renamed from arch/i386/kernel/time.c.old +1 -1
@@ -645,7 +645,7 @@
 }
 
 static struct notifier_block time_cpufreq_notifier_block = {
-	notifier_call:	time_cpufreq_notifier
+	.notifier_call	= time_cpufreq_notifier
 };
 #endif
arch/i386/kernel/timers/timer_tsc.c renamed from arch/i386/kernel/timers/timer_tsc.c.old +1 -1
@@ -205,7 +205,7 @@
 }
 
 static struct notifier_block time_cpufreq_notifier_block = {
-	notifier_call:	time_cpufreq_notifier
+	.notifier_call	= time_cpufreq_notifier
 };
 #endif
arch/i386/pci/numa.c renamed from arch/i386/pci/numa.c.old +2 -2
@@ -84,8 +84,8 @@
 }
 
 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
 };
Signature · 3 lines
They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759
#1 lore raw
Quoted 7 lines · Art Haas

Here's a set of patches that switch arch/i386 to use C99 named initiailzers. The patches are all against 2.5.42.

arch/i386/kernel/cpu/intel.c line 372

Quoted 8 lines
arch/i386/kernel/cpu/intel.c renamed from arch/i386/kernel/cpu/intel.c.old +1 -1
@@ -366,7 +366,7 @@
 static struct cpu_dev intel_cpu_dev __initdata = {
 	.c_vendor	= "Intel",
 	.c_ident 	= { "GenuineIntel" },
-	c_models: {
+	.c_models = {
 		{ X86_VENDOR_INTEL,	4,
 		  { 
 			  [0] "486 DX-25/33", 

                             ^

C99 doesn't allow not having a '=' there.

Signature · 1 line
	Falk