diff --git a/src/cpu/amd/pi/00730F01/chip_name.c b/src/cpu/amd/pi/00730F01/chip_name.c
index d5955cc..592fcc0 100644
--- a/src/cpu/amd/pi/00730F01/chip_name.c
+++ b/src/cpu/amd/pi/00730F01/chip_name.c
@@ -3,5 +3,5 @@
 #include <device/device.h>
 
 struct chip_operations cpu_amd_pi_00730F01_ops = {
-	CHIP_NAME("AMD CPU Family 16h Model 30h-3Fh")
+	.name = "AMD CPU Family 16h Model 30h-3Fh",
 };
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index 3727d8a..c8f6a07 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -364,5 +364,5 @@
 }
 
 struct chip_operations cpu_intel_haswell_ops = {
-	CHIP_NAME("Intel Haswell CPU")
+	.name = "Intel Haswell CPU",
 };
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 315e7c3..c2019ab 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -277,5 +277,5 @@
 };
 
 struct chip_operations cpu_intel_model_1067x_ops = {
-	CHIP_NAME("Intel Penryn CPU")
+	.name = "Intel Penryn CPU",
 };
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index d8fef62..2dceba1 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -242,5 +242,5 @@
 }
 
 struct chip_operations cpu_intel_model_2065x_ops = {
-	CHIP_NAME("Intel Arrandale CPU")
+	.name = "Intel Arrandale CPU",
 };
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index f3bd67b..75e6755 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -380,5 +380,5 @@
 }
 
 struct chip_operations cpu_intel_model_206ax_ops = {
-	CHIP_NAME("Intel SandyBridge/IvyBridge CPU")
+	.name = "Intel SandyBridge/IvyBridge CPU",
 };
diff --git a/src/cpu/intel/slot_1/slot_1.c b/src/cpu/intel/slot_1/slot_1.c
index 0f5b157..ed8e88c 100644
--- a/src/cpu/intel/slot_1/slot_1.c
+++ b/src/cpu/intel/slot_1/slot_1.c
@@ -3,5 +3,5 @@
 #include <device/device.h>
 
 struct chip_operations cpu_intel_slot_1_ops = {
-	CHIP_NAME("Slot 1 CPU")
+	.name = "Slot 1 CPU",
 };
diff --git a/src/cpu/power9/power9.c b/src/cpu/power9/power9.c
index fd33ff2..4d68a5f 100644
--- a/src/cpu/power9/power9.c
+++ b/src/cpu/power9/power9.c
@@ -16,5 +16,5 @@
 };
 
 struct chip_operations cpu_power8_qemu_ops = {
-	CHIP_NAME("POWER9 CPU")
+	.name = "POWER9 CPU",
 };
diff --git a/src/cpu/qemu-power8/qemu.c b/src/cpu/qemu-power8/qemu.c
index 2da3c9f..8cde9b3 100644
--- a/src/cpu/qemu-power8/qemu.c
+++ b/src/cpu/qemu-power8/qemu.c
@@ -21,5 +21,5 @@
 };
 
 struct chip_operations cpu_power8_qemu_ops = {
-	CHIP_NAME("QEMU POWER8 CPU")
+	.name = "QEMU POWER8 CPU",
 };
diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c
index 06696c8..289854a 100644
--- a/src/cpu/qemu-x86/qemu.c
+++ b/src/cpu/qemu-x86/qemu.c
@@ -22,5 +22,5 @@
 };
 
 struct chip_operations cpu_qemu_x86_ops = {
-	CHIP_NAME("QEMU x86 CPU")
+	.name = "QEMU x86 CPU",
 };
diff --git a/src/drivers/acpi/thermal_zone/thermal_zone.c b/src/drivers/acpi/thermal_zone/thermal_zone.c
index 192e2e6..34fa1b8 100644
--- a/src/drivers/acpi/thermal_zone/thermal_zone.c
+++ b/src/drivers/acpi/thermal_zone/thermal_zone.c
@@ -126,6 +126,6 @@
 }
 
 struct chip_operations drivers_acpi_thermal_zone_ops = {
-	CHIP_NAME("ACPI Thermal Zone")
+	.name = "ACPI Thermal Zone",
 	.enable_dev = thermal_zone_enable_dev,
 };
diff --git a/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c b/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c
index 7bd256d..16ae48d 100644
--- a/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c
+++ b/src/drivers/amd/i2s_machine_dev/i2s_machine_dev.c
@@ -95,6 +95,6 @@
 }
 
 struct chip_operations drivers_amd_i2s_machine_dev_ops = {
-	CHIP_NAME("AMD I2S Machine Device")
+	.name = "AMD I2S Machine Device",
 	.enable_dev = i2s_machine_dev_enable
 };
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 2c9128e..a5d7dcc 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -206,6 +206,6 @@
 }
 
 struct chip_operations drivers_crb_ops = {
-	CHIP_NAME("CRB TPM")
+	.name = "CRB TPM",
 	.enable_dev = enable_dev
 };
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 63510cd..5917f69 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -67,6 +67,6 @@
 }
 
 struct chip_operations drivers_generic_adau7002_ops = {
-	CHIP_NAME("Analog Digital DMIC")
+	.name = "Analog Digital DMIC",
 	.enable_dev = adau7002_enable
 };
diff --git a/src/drivers/generic/alc1015/alc1015.c b/src/drivers/generic/alc1015/alc1015.c
index ca685d6..7245f0c 100644
--- a/src/drivers/generic/alc1015/alc1015.c
+++ b/src/drivers/generic/alc1015/alc1015.c
@@ -70,6 +70,6 @@
 }
 
 struct chip_operations drivers_generic_alc1015_ops = {
-	CHIP_NAME("ASoC RT1015P Amplifier driver")
+	.name = "ASoC RT1015P Amplifier driver",
 	.enable_dev = alc1015_enable
 };
diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c
index 02abc22..5104c35 100644
--- a/src/drivers/generic/bayhub/bh720.c
+++ b/src/drivers/generic/bayhub/bh720.c
@@ -166,5 +166,5 @@
 };
 
 struct chip_operations drivers_generic_bayhub_ops = {
-	CHIP_NAME("BayHub Technology BH720 PCI to eMMC 5.0 HS200 bridge")
+	.name = "BayHub Technology BH720 PCI to eMMC 5.0 HS200 bridge",
 };
diff --git a/src/drivers/generic/bayhub_lv2/lv2.c b/src/drivers/generic/bayhub_lv2/lv2.c
index b8d4113..b2b85e1 100644
--- a/src/drivers/generic/bayhub_lv2/lv2.c
+++ b/src/drivers/generic/bayhub_lv2/lv2.c
@@ -81,5 +81,5 @@
 };
 
 struct chip_operations drivers_generic_bayhub_lv2_ops = {
-	CHIP_NAME("BayHub Technology LV2 PCIe to SD bridge")
+	.name = "BayHub Technology LV2 PCIe to SD bridge",
 };
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index c0fd8de..28e5be5 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -120,6 +120,6 @@
 }
 
 struct chip_operations drivers_generic_gpio_keys_ops = {
-	CHIP_NAME("GPIO Keys")
+	.name = "GPIO Keys",
 	.enable_dev = gpio_keys_enable
 };
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 7a18b98..8ce80f1 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -93,6 +93,6 @@
 }
 
 struct chip_operations drivers_generic_max98357a_ops = {
-	CHIP_NAME("Maxim Integrated 98357A Amplifier")
+	.name = "Maxim Integrated 98357A Amplifier",
 	.enable_dev = max98357a_enable
 };
diff --git a/src/drivers/generic/nau8315/nau8315.c b/src/drivers/generic/nau8315/nau8315.c
index ac2bfd1..8fe4e1f 100644
--- a/src/drivers/generic/nau8315/nau8315.c
+++ b/src/drivers/generic/nau8315/nau8315.c
@@ -71,6 +71,6 @@
 }
 
 struct chip_operations drivers_generic_nau8315_ops = {
-	CHIP_NAME("Nuvoton NAU8315 Amplifier")
+	.name = "Nuvoton NAU8315 Amplifier",
 	.enable_dev = nau8315_enable
 };
diff --git a/src/drivers/genesyslogic/gl9750/gl9750.c b/src/drivers/genesyslogic/gl9750/gl9750.c
index 8c40c49..92d96be 100644
--- a/src/drivers/genesyslogic/gl9750/gl9750.c
+++ b/src/drivers/genesyslogic/gl9750/gl9750.c
@@ -50,5 +50,5 @@
 };
 
 struct chip_operations drivers_generic_genesyslogic_gl9750_ops = {
-	CHIP_NAME("Genesys Logic GL9750")
+	.name = "Genesys Logic GL9750",
 };
diff --git a/src/drivers/genesyslogic/gl9755/gl9755.c b/src/drivers/genesyslogic/gl9755/gl9755.c
index bf4831c..6b8dd7d 100644
--- a/src/drivers/genesyslogic/gl9755/gl9755.c
+++ b/src/drivers/genesyslogic/gl9755/gl9755.c
@@ -58,5 +58,5 @@
 };
 
 struct chip_operations drivers_generic_genesyslogic_gl9755_ops = {
-	CHIP_NAME("Genesys Logic GL9755")
+	.name = "Genesys Logic GL9755",
 };
diff --git a/src/drivers/genesyslogic/gl9763e/gl9763e.c b/src/drivers/genesyslogic/gl9763e/gl9763e.c
index a4842e8..140535d 100644
--- a/src/drivers/genesyslogic/gl9763e/gl9763e.c
+++ b/src/drivers/genesyslogic/gl9763e/gl9763e.c
@@ -66,5 +66,5 @@
 };
 
 struct chip_operations drivers_generic_genesyslogic_ops = {
-	CHIP_NAME("Genesys Logic GL9763E")
+	.name = "Genesys Logic GL9763E",
 };
diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c
index 0ab1676..e3ae62f 100644
--- a/src/drivers/gfx/generic/generic.c
+++ b/src/drivers/gfx/generic/generic.c
@@ -160,6 +160,6 @@
 }
 
 struct chip_operations drivers_gfx_generic_ops = {
-	CHIP_NAME("Generic Graphics Device")
+	.name = "Generic Graphics Device",
 	.enable_dev = gfx_enable
 };
diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c
index ce6aa86..99ea7a4 100644
--- a/src/drivers/i2c/at24rf08c/at24rf08c.c
+++ b/src/drivers/i2c/at24rf08c/at24rf08c.c
@@ -41,6 +41,6 @@
 }
 
 struct chip_operations drivers_i2c_at24rf08c_ops = {
-	CHIP_NAME("AT24RF08C")
+	.name = "AT24RF08C",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/ck505/ck505.c b/src/drivers/i2c/ck505/ck505.c
index 58eaec6..db660fe 100644
--- a/src/drivers/i2c/ck505/ck505.c
+++ b/src/drivers/i2c/ck505/ck505.c
@@ -55,6 +55,6 @@
 }
 
 struct chip_operations drivers_i2c_ck505_ops = {
-	CHIP_NAME("CK505 Clock generator")
+	.name = "CK505 Clock generator",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/cs35l53/cs35l53.c b/src/drivers/i2c/cs35l53/cs35l53.c
index 9857203..578e272 100644
--- a/src/drivers/i2c/cs35l53/cs35l53.c
+++ b/src/drivers/i2c/cs35l53/cs35l53.c
@@ -145,6 +145,6 @@
 }
 
 struct chip_operations drivers_i2c_cs35l53_ops = {
-	CHIP_NAME("Cirrus Logic CS35L53 Audio Codec")
+	.name = "Cirrus Logic CS35L53 Audio Codec",
 	.enable_dev = cs35l53_enable
 };
diff --git a/src/drivers/i2c/cs42l42/cs42l42.c b/src/drivers/i2c/cs42l42/cs42l42.c
index dcf83e0..8ccfd77 100644
--- a/src/drivers/i2c/cs42l42/cs42l42.c
+++ b/src/drivers/i2c/cs42l42/cs42l42.c
@@ -118,6 +118,6 @@
 }
 
 struct chip_operations drivers_i2c_cs42l42_ops = {
-	CHIP_NAME("Cirrus Logic CS42l42 Audio Codec")
+	.name = "Cirrus Logic CS42l42 Audio Codec",
 	.enable_dev = cs42l42_enable
 };
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 80c5272..1a149ca 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -110,6 +110,6 @@
 }
 
 struct chip_operations drivers_i2c_da7219_ops = {
-	CHIP_NAME("Dialog Semiconductor DA7219 Audio Codec")
+	.name = "Dialog Semiconductor DA7219 Audio Codec",
 	.enable_dev = da7219_enable
 };
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 1a3ec40..2a4acb2 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -229,6 +229,6 @@
 }
 
 struct chip_operations drivers_i2c_generic_ops = {
-	CHIP_NAME("I2C Device")
+	.name = "I2C Device",
 	.enable_dev = i2c_generic_enable
 };
diff --git a/src/drivers/i2c/gpiomux/bus/bus.c b/src/drivers/i2c/gpiomux/bus/bus.c
index 2bdb1030..a6c603a 100644
--- a/src/drivers/i2c/gpiomux/bus/bus.c
+++ b/src/drivers/i2c/gpiomux/bus/bus.c
@@ -55,6 +55,6 @@
 }
 
 struct chip_operations drivers_i2c_gpiomux_bus_ops = {
-	CHIP_NAME("I2C GPIO MUX Bus Device")
+	.name = "I2C GPIO MUX Bus Device",
 	.enable_dev = i2c_gpiomux_bus_enable
 };
diff --git a/src/drivers/i2c/gpiomux/mux/mux.c b/src/drivers/i2c/gpiomux/mux/mux.c
index fa1b18c..5f79fe5 100644
--- a/src/drivers/i2c/gpiomux/mux/mux.c
+++ b/src/drivers/i2c/gpiomux/mux/mux.c
@@ -77,6 +77,6 @@
 }
 
 struct chip_operations drivers_i2c_gpiomux_mux_ops = {
-	CHIP_NAME("I2C GPIO MUX Device")
+	.name = "I2C GPIO MUX Device",
 	.enable_dev = i2c_gpiomux_mux_enable
 };
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index 8705c1e..fb3a439 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -90,6 +90,6 @@
 }
 
 struct chip_operations drivers_i2c_hid_ops = {
-	CHIP_NAME("I2C HID Device")
+	.name = "I2C HID Device",
 	.enable_dev = i2c_hid_enable
 };
diff --git a/src/drivers/i2c/lm96000/lm96000.c b/src/drivers/i2c/lm96000/lm96000.c
index a2b7a21..f17d8c0 100644
--- a/src/drivers/i2c/lm96000/lm96000.c
+++ b/src/drivers/i2c/lm96000/lm96000.c
@@ -215,6 +215,6 @@
 }
 
 struct chip_operations drivers_i2c_lm96000_ops = {
-	CHIP_NAME("LM96000")
+	.name = "LM96000",
 	.enable_dev = lm96000_enable
 };
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index eb5590d..37a8864 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -90,6 +90,6 @@
 }
 
 struct chip_operations drivers_i2c_max98373_ops = {
-	CHIP_NAME("Maxim MAX98373 Codec")
+	.name = "Maxim MAX98373 Codec",
 	.enable_dev = max98373_enable
 };
diff --git a/src/drivers/i2c/max98390/max98390.c b/src/drivers/i2c/max98390/max98390.c
index 11acd22..f4c4a70 100644
--- a/src/drivers/i2c/max98390/max98390.c
+++ b/src/drivers/i2c/max98390/max98390.c
@@ -129,6 +129,6 @@
 }
 
 struct chip_operations drivers_i2c_max98390_ops = {
-	CHIP_NAME("Maxim MAX98390 Codec")
+	.name = "Maxim MAX98390 Codec",
 	.enable_dev = max98390_enable
 };
diff --git a/src/drivers/i2c/max98396/max98396.c b/src/drivers/i2c/max98396/max98396.c
index 5288c4f..6ad3931 100644
--- a/src/drivers/i2c/max98396/max98396.c
+++ b/src/drivers/i2c/max98396/max98396.c
@@ -96,6 +96,6 @@
 }
 
 struct chip_operations drivers_i2c_max98396_ops = {
-	CHIP_NAME("Maxim MAX98396 Codec")
+	.name = "Maxim MAX98396 Codec",
 	.enable_dev = max98396_enable
 };
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index e80f569f..9935d10 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -86,6 +86,6 @@
 }
 
 struct chip_operations drivers_i2c_max98927_ops = {
-	CHIP_NAME("Maxim MAX98927 Codec")
+	.name = "Maxim MAX98927 Codec",
 	.enable_dev = max98927_enable
 };
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 060df7c..9e82538 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -103,6 +103,6 @@
 }
 
 struct chip_operations drivers_i2c_nau8825_ops = {
-	CHIP_NAME("Nuvoton NAU8825 Codec")
+	.name = "Nuvoton NAU8825 Codec",
 	.enable_dev = nau8825_enable
 };
diff --git a/src/drivers/i2c/nct7802y/nct7802y.c b/src/drivers/i2c/nct7802y/nct7802y.c
index bb52a3f..f313ef7 100644
--- a/src/drivers/i2c/nct7802y/nct7802y.c
+++ b/src/drivers/i2c/nct7802y/nct7802y.c
@@ -45,6 +45,6 @@
 }
 
 struct chip_operations drivers_i2c_nct7802y_ops = {
-	CHIP_NAME("NCT7802Y")
+	.name = "NCT7802Y",
 	.enable_dev = nct7802y_enable
 };
diff --git a/src/drivers/i2c/pca9538/pca9538.c b/src/drivers/i2c/pca9538/pca9538.c
index 1658b9e..f8933ec 100644
--- a/src/drivers/i2c/pca9538/pca9538.c
+++ b/src/drivers/i2c/pca9538/pca9538.c
@@ -49,6 +49,6 @@
 }
 
 struct chip_operations drivers_i2c_pca9538_ops = {
-	CHIP_NAME("PCA9538")
+	.name = "PCA9538",
 	.enable_dev = pca9538_enable
 };
diff --git a/src/drivers/i2c/pcf8523/pcf8523.c b/src/drivers/i2c/pcf8523/pcf8523.c
index 8d368b2..717bc90 100644
--- a/src/drivers/i2c/pcf8523/pcf8523.c
+++ b/src/drivers/i2c/pcf8523/pcf8523.c
@@ -129,6 +129,6 @@
 }
 
 struct chip_operations drivers_i2c_pcf8523_ops = {
-	CHIP_NAME("PCF8523")
+	.name = "PCF8523",
 	.enable_dev = pcf8523_enable
 };
diff --git a/src/drivers/i2c/pi608gp/pi608gp.c b/src/drivers/i2c/pi608gp/pi608gp.c
index 2c61a80..62d462e 100644
--- a/src/drivers/i2c/pi608gp/pi608gp.c
+++ b/src/drivers/i2c/pi608gp/pi608gp.c
@@ -188,5 +188,5 @@
 };
 
 struct chip_operations drivers_i2c_pi608gp_ops = {
-	CHIP_NAME("PI7C9X2G608GP")
+	.name = "PI7C9X2G608GP",
 };
diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c
index 7dee222..93acb18 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.c
+++ b/src/drivers/i2c/ptn3460/ptn3460.c
@@ -148,7 +148,7 @@
 }
 
 struct chip_operations drivers_i2c_ptn3460_ops = {
-	CHIP_NAME("PTN3460")
+	.name = "PTN3460",
 	.enable_dev = ptn3460_enable
 };
 
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index 9a21748..bf62a6f 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -103,6 +103,6 @@
 }
 
 struct chip_operations drivers_i2c_rt1011_ops = {
-	CHIP_NAME("Realtek RT1011 Codec")
+	.name = "Realtek RT1011 Codec",
 	.enable_dev = rt1011_enable
 };
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 9949566..e2341dd 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -84,6 +84,6 @@
 }
 
 struct chip_operations drivers_i2c_rt5663_ops = {
-	CHIP_NAME("Realtek RT5663 Codec")
+	.name = "Realtek RT5663 Codec",
 	.enable_dev = rt5663_enable
 };
diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c
index 41dd887..82b032e 100644
--- a/src/drivers/i2c/rtd2132/rtd2132.c
+++ b/src/drivers/i2c/rtd2132/rtd2132.c
@@ -235,6 +235,6 @@
 }
 
 struct chip_operations drivers_i2c_rtd2132_ops = {
-	CHIP_NAME("Realtek RTD2132 LVDS Bridge")
+	.name = "Realtek RTD2132 LVDS Bridge",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/rv3028c7/rv3028c7.c b/src/drivers/i2c/rv3028c7/rv3028c7.c
index 87cbc24..0a1e4b6 100644
--- a/src/drivers/i2c/rv3028c7/rv3028c7.c
+++ b/src/drivers/i2c/rv3028c7/rv3028c7.c
@@ -251,6 +251,6 @@
 }
 
 struct chip_operations drivers_i2c_rv3028c7_ops = {
-	CHIP_NAME("RV-3028-C7")
+	.name = "RV-3028-C7",
 	.enable_dev = rtc_enable
 };
diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c
index 02b3d9f..ce5051d 100644
--- a/src/drivers/i2c/rx6110sa/rx6110sa.c
+++ b/src/drivers/i2c/rx6110sa/rx6110sa.c
@@ -239,6 +239,6 @@
 }
 
 struct chip_operations drivers_i2c_rx6110sa_ops = {
-	CHIP_NAME("RX6110 SA")
+	.name = "RX6110 SA",
 	.enable_dev = rx6110sa_enable
 };
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 68aea6c..5094608 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -131,6 +131,6 @@
 }
 
 struct chip_operations drivers_i2c_sx9310_ops = {
-	CHIP_NAME(I2C_SX9310_ACPI_NAME)
+	.name = I2C_SX9310_ACPI_NAME,
 	.enable_dev = i2c_sx9310_enable
 };
diff --git a/src/drivers/i2c/sx9324/sx9324.c b/src/drivers/i2c/sx9324/sx9324.c
index 3678491..05aca00 100644
--- a/src/drivers/i2c/sx9324/sx9324.c
+++ b/src/drivers/i2c/sx9324/sx9324.c
@@ -115,6 +115,6 @@
 }
 
 struct chip_operations drivers_i2c_sx9324_ops = {
-	CHIP_NAME(I2C_SX9324_CHIP_NAME)
+	.name = I2C_SX9324_CHIP_NAME,
 	.enable_dev = i2c_sx9324_enable
 };
diff --git a/src/drivers/i2c/sx9360/sx9360.c b/src/drivers/i2c/sx9360/sx9360.c
index 9ea4c8b..c9de0de 100644
--- a/src/drivers/i2c/sx9360/sx9360.c
+++ b/src/drivers/i2c/sx9360/sx9360.c
@@ -102,6 +102,6 @@
 }
 
 struct chip_operations drivers_i2c_sx9360_ops = {
-	CHIP_NAME(I2C_SX9360_CHIP_NAME)
+	.name = I2C_SX9360_CHIP_NAME,
 	.enable_dev = i2c_sx9360_enable
 };
diff --git a/src/drivers/i2c/tas5825m/tas5825m.c b/src/drivers/i2c/tas5825m/tas5825m.c
index 39e5575..9f14059 100644
--- a/src/drivers/i2c/tas5825m/tas5825m.c
+++ b/src/drivers/i2c/tas5825m/tas5825m.c
@@ -75,6 +75,6 @@
 }
 
 struct chip_operations drivers_i2c_tas5825m_ops = {
-	CHIP_NAME("TI TAS5825M Amplifier")
+	.name = "TI TAS5825M Amplifier",
 	.enable_dev = tas5825m_enable_dev,
 };
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index 07052f6..a1d7389 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -95,6 +95,6 @@
 }
 
 struct chip_operations drivers_i2c_tpm_ops = {
-	CHIP_NAME("I2C TPM")
+	.name = "I2C TPM",
 	.enable_dev = i2c_tpm_enable
 };
diff --git a/src/drivers/intel/dptf/dptf.c b/src/drivers/intel/dptf/dptf.c
index 71a4ec3..bceb0de 100644
--- a/src/drivers/intel/dptf/dptf.c
+++ b/src/drivers/intel/dptf/dptf.c
@@ -636,6 +636,6 @@
 }
 
 struct chip_operations drivers_intel_dptf_ops = {
-	CHIP_NAME("Intel DPTF")
+	.name = "Intel DPTF",
 	.enable_dev = dptf_enable_dev,
 };
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 9711632..6dba46a 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -97,6 +97,6 @@
 };
 
 struct chip_operations drivers_intel_ish_ops = {
-	CHIP_NAME("Intel ISH Chip")
+	.name = "Intel ISH Chip",
 	.enable_dev	= intel_ish_enable,
 };
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 00c85a7..77c86ea 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -1033,6 +1033,6 @@
 }
 
 struct chip_operations drivers_intel_mipi_camera_ops = {
-	CHIP_NAME("Intel MIPI Camera Device")
+	.name = "Intel MIPI Camera Device",
 	.enable_dev = camera_enable
 };
diff --git a/src/drivers/intel/pmc_mux/conn/conn.c b/src/drivers/intel/pmc_mux/conn/conn.c
index de8f2be..c2c7199 100644
--- a/src/drivers/intel/pmc_mux/conn/conn.c
+++ b/src/drivers/intel/pmc_mux/conn/conn.c
@@ -153,7 +153,7 @@
 }
 
 struct chip_operations drivers_intel_pmc_mux_conn_ops = {
-	CHIP_NAME("Intel PMC MUX CONN Driver")
+	.name = "Intel PMC MUX CONN Driver",
 	.enable_dev	= conn_enable,
 };
 
diff --git a/src/drivers/intel/pmc_mux/mux.c b/src/drivers/intel/pmc_mux/mux.c
index e209915..64669f6 100644
--- a/src/drivers/intel/pmc_mux/mux.c
+++ b/src/drivers/intel/pmc_mux/mux.c
@@ -43,6 +43,6 @@
 }
 
 struct chip_operations drivers_intel_pmc_mux_ops = {
-	CHIP_NAME("Intel PMC MUX Driver")
+	.name = "Intel PMC MUX Driver",
 	.enable_dev	= mux_enable,
 };
diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c
index c7e84a5..f9421fc 100644
--- a/src/drivers/intel/soundwire/soundwire.c
+++ b/src/drivers/intel/soundwire/soundwire.c
@@ -94,6 +94,6 @@
 }
 
 struct chip_operations drivers_intel_soundwire_ops = {
-	CHIP_NAME("Intel SoundWire Controller")
+	.name = "Intel SoundWire Controller",
 	.enable_dev = intel_soundwire_enable
 };
diff --git a/src/drivers/intel/usb4/retimer/retimer.c b/src/drivers/intel/usb4/retimer/retimer.c
index 7fb600d..9704139 100644
--- a/src/drivers/intel/usb4/retimer/retimer.c
+++ b/src/drivers/intel/usb4/retimer/retimer.c
@@ -460,7 +460,7 @@
 }
 
 struct chip_operations drivers_intel_usb4_retimer_ops = {
-	CHIP_NAME("Intel USB4 Retimer")
+	.name = "Intel USB4 Retimer",
 	.enable_dev = usb4_retimer_enable
 };
 
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index 2e5378f..69db489 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/src/drivers/ipmi/ipmi_kcs_ops.c
@@ -360,6 +360,6 @@
 }
 
 struct chip_operations drivers_ipmi_ops = {
-	CHIP_NAME("IPMI KCS")
+	.name = "IPMI KCS",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/ipmi/ocp/ipmi_ocp.c b/src/drivers/ipmi/ocp/ipmi_ocp.c
index e75edca..0f003af 100644
--- a/src/drivers/ipmi/ocp/ipmi_ocp.c
+++ b/src/drivers/ipmi/ocp/ipmi_ocp.c
@@ -95,6 +95,6 @@
 }
 
 struct chip_operations drivers_ipmi_ocp_ops = {
-	CHIP_NAME("IPMI OCP")
+	.name = "IPMI OCP",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c
index 7a5e20d..1fda1fd 100644
--- a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c
+++ b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c
@@ -53,6 +53,6 @@
 }
 
 struct chip_operations drivers_lenovo_hybrid_graphics_ops = {
-	CHIP_NAME("Lenovo hybrid graphics driver")
+	.name = "Lenovo hybrid graphics driver",
 	.enable_dev = lenovo_hybrid_graphics_enable
 };
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index fb9bcde..fe85b83 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -153,5 +153,5 @@
 };
 
 struct chip_operations drivers_net_ops = {
-	CHIP_NAME("Atheros AR8121/AR8113/AR8114")
+	.name = "Atheros AR8121/AR8113/AR8114",
 };
diff --git a/src/drivers/net/phy/m88e1512/m88e1512.c b/src/drivers/net/phy/m88e1512/m88e1512.c
index 2e8994c..07110c6 100644
--- a/src/drivers/net/phy/m88e1512/m88e1512.c
+++ b/src/drivers/net/phy/m88e1512/m88e1512.c
@@ -97,5 +97,5 @@
 };
 
 struct chip_operations drivers_net_phy_m88e1512_ops = {
-	CHIP_NAME("88E1512")
+	.name = "88E1512",
 };
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index f21edd0..70a0f63 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -441,5 +441,5 @@
 };
 
 struct chip_operations drivers_net_ops = {
-	CHIP_NAME("Realtek r8168")
+	.name = "Realtek r8168",
 };
diff --git a/src/drivers/nxp/uwb/uwb.c b/src/drivers/nxp/uwb/uwb.c
index 978edeb..0f5ba47 100644
--- a/src/drivers/nxp/uwb/uwb.c
+++ b/src/drivers/nxp/uwb/uwb.c
@@ -133,6 +133,6 @@
 }
 
 struct chip_operations drivers_nxp_uwb_ops = {
-	CHIP_NAME("NXP UWB Device")
+	.name = "NXP UWB Device",
 	.enable_dev = nxb_uwb_enable
 };
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 019e4a1..2099bb7 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -854,6 +854,6 @@
 }
 
 struct chip_operations drivers_pc80_tpm_ops = {
-	CHIP_NAME("LPC TPM")
+	.name = "LPC TPM",
 	.enable_dev = enable_dev
 };
diff --git a/src/drivers/pcie/generic/generic.c b/src/drivers/pcie/generic/generic.c
index 1873e65..1b7976e 100644
--- a/src/drivers/pcie/generic/generic.c
+++ b/src/drivers/pcie/generic/generic.c
@@ -68,6 +68,6 @@
 }
 
 struct chip_operations drivers_pcie_generic_ops = {
-	CHIP_NAME("PCIe Device")
+	.name = "PCIe Device",
 	.enable_dev = pcie_generic_enable
 };
diff --git a/src/drivers/pcie/rtd3/device/chip.c b/src/drivers/pcie/rtd3/device/chip.c
index 88b85f1..314aff8 100644
--- a/src/drivers/pcie/rtd3/device/chip.c
+++ b/src/drivers/pcie/rtd3/device/chip.c
@@ -150,6 +150,6 @@
 }
 
 struct chip_operations drivers_pcie_rtd3_device_ops = {
-	CHIP_NAME("PCIe Device w/ Runtime D3")
+	.name = "PCIe Device w/ Runtime D3",
 	.enable_dev = pcie_rtd3_device_enable
 };
diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c
index c85b4d1..f1cba75 100644
--- a/src/drivers/ricoh/rce822/rce822.c
+++ b/src/drivers/ricoh/rce822/rce822.c
@@ -58,5 +58,5 @@
 };
 
 struct chip_operations drivers_ricoh_rce822_ops = {
-	CHIP_NAME("RICOH RCE822")
+	.name = "RICOH RCE822",
 };
diff --git a/src/drivers/secunet/dmi/smbios.c b/src/drivers/secunet/dmi/smbios.c
index f407b51..fb8d75a 100644
--- a/src/drivers/secunet/dmi/smbios.c
+++ b/src/drivers/secunet/dmi/smbios.c
@@ -91,6 +91,6 @@
 }
 
 struct chip_operations drivers_secunet_dmi_ops = {
-	CHIP_NAME("secunet DMI")
+	.name = "secunet DMI",
 	.enable_dev = enable_dev,
 };
diff --git a/src/drivers/sof/sof.c b/src/drivers/sof/sof.c
index b353790..db945aa 100644
--- a/src/drivers/sof/sof.c
+++ b/src/drivers/sof/sof.c
@@ -85,6 +85,6 @@
 }
 
 struct chip_operations drivers_sof_ops = {
-	CHIP_NAME("SOF")
+	.name = "SOF",
 	.enable_dev = sof_enable
 };
diff --git a/src/drivers/soundwire/alc1308/alc1308.c b/src/drivers/soundwire/alc1308/alc1308.c
index f16d3a2..5449fe8 100644
--- a/src/drivers/soundwire/alc1308/alc1308.c
+++ b/src/drivers/soundwire/alc1308/alc1308.c
@@ -146,6 +146,6 @@
 }
 
 struct chip_operations drivers_soundwire_alc1308_ops = {
-	CHIP_NAME("Realtek ALC1308 SoundWire Codec")
+	.name = "Realtek ALC1308 SoundWire Codec",
 	.enable_dev = soundwire_alc1308_enable
 };
diff --git a/src/drivers/soundwire/alc5682/alc5682.c b/src/drivers/soundwire/alc5682/alc5682.c
index c1aaff6..0d8a3ab 100644
--- a/src/drivers/soundwire/alc5682/alc5682.c
+++ b/src/drivers/soundwire/alc5682/alc5682.c
@@ -174,6 +174,6 @@
 }
 
 struct chip_operations drivers_soundwire_alc5682_ops = {
-	CHIP_NAME("Realtek ALC5682 SoundWire Codec")
+	.name = "Realtek ALC5682 SoundWire Codec",
 	.enable_dev = soundwire_alc5682_enable
 };
diff --git a/src/drivers/soundwire/alc711/alc711.c b/src/drivers/soundwire/alc711/alc711.c
index 34d55c7..cfe28ad 100644
--- a/src/drivers/soundwire/alc711/alc711.c
+++ b/src/drivers/soundwire/alc711/alc711.c
@@ -151,6 +151,6 @@
 }
 
 struct chip_operations drivers_soundwire_alc711_ops = {
-	CHIP_NAME("Realtek ALC711 SoundWire Codec")
+	.name = "Realtek ALC711 SoundWire Codec",
 	.enable_dev = soundwire_alc711_enable
 };
diff --git a/src/drivers/soundwire/cs42l42/cs42l42.c b/src/drivers/soundwire/cs42l42/cs42l42.c
index 111844c..e7c14cc 100644
--- a/src/drivers/soundwire/cs42l42/cs42l42.c
+++ b/src/drivers/soundwire/cs42l42/cs42l42.c
@@ -226,6 +226,6 @@
 }
 
 struct chip_operations drivers_soundwire_cs42l42_ops = {
-	CHIP_NAME("Cirrus Logic CS42L42 SoundWire Codec")
+	.name = "Cirrus Logic CS42L42 SoundWire Codec",
 	.enable_dev = soundwire_cs42l42_enable
 };
diff --git a/src/drivers/soundwire/max98363/max98363.c b/src/drivers/soundwire/max98363/max98363.c
index 2963cda..7b90d78 100644
--- a/src/drivers/soundwire/max98363/max98363.c
+++ b/src/drivers/soundwire/max98363/max98363.c
@@ -136,6 +136,6 @@
 }
 
 struct chip_operations drivers_soundwire_max98363_ops = {
-	CHIP_NAME("Maxim MAX98363 SoundWire Codec")
+	.name = "Maxim MAX98363 SoundWire Codec",
 	.enable_dev = soundwire_max98363_enable
 };
diff --git a/src/drivers/soundwire/max98373/max98373.c b/src/drivers/soundwire/max98373/max98373.c
index fb202fe..e3107c4 100644
--- a/src/drivers/soundwire/max98373/max98373.c
+++ b/src/drivers/soundwire/max98373/max98373.c
@@ -160,6 +160,6 @@
 }
 
 struct chip_operations drivers_soundwire_max98373_ops = {
-	CHIP_NAME("Maxim MAX98373 SoundWire Codec")
+	.name = "Maxim MAX98373 SoundWire Codec",
 	.enable_dev = soundwire_max98373_enable
 };
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 9b6fd80..b58bc2d 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -200,6 +200,6 @@
 }
 
 struct chip_operations drivers_spi_acpi_ops = {
-	CHIP_NAME("SPI Device")
+	.name = "SPI Device",
 	.enable_dev = spi_acpi_enable
 };
diff --git a/src/drivers/uart/acpi/acpi.c b/src/drivers/uart/acpi/acpi.c
index c43dc52..bcf896d 100644
--- a/src/drivers/uart/acpi/acpi.c
+++ b/src/drivers/uart/acpi/acpi.c
@@ -169,6 +169,6 @@
 }
 
 struct chip_operations drivers_uart_acpi_ops = {
-	CHIP_NAME("ACPI UART Device")
+	.name = "ACPI UART Device",
 	.enable_dev = uart_acpi_enable
 };
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index b95ebc9..b463b3b 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -127,7 +127,7 @@
 }
 
 struct chip_operations drivers_usb_acpi_ops = {
-	CHIP_NAME("USB ACPI Device")
+	.name = "USB ACPI Device",
 	.enable_dev = usb_acpi_enable
 };
 
diff --git a/src/drivers/usb/hub/acpi.c b/src/drivers/usb/hub/acpi.c
index 10e38fb6..e26d584 100644
--- a/src/drivers/usb/hub/acpi.c
+++ b/src/drivers/usb/hub/acpi.c
@@ -85,6 +85,6 @@
 }
 
 struct chip_operations drivers_usb_hub_ops = {
-	 CHIP_NAME("USB Hub")
+	 .name = "USB Hub",
 	.enable_dev = usb_hub_acpi_enable
 };
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index 19d281f..283b45a 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -67,7 +67,7 @@
 }
 
 struct chip_operations drivers_wifi_generic_ops = {
-	CHIP_NAME("WIFI Device")
+	.name = "WIFI Device",
 	.enable_dev = wifi_generic_enable
 };
 
diff --git a/src/drivers/wwan/fm/acpi_fm350gl.c b/src/drivers/wwan/fm/acpi_fm350gl.c
index 08f672f..77ff085 100644
--- a/src/drivers/wwan/fm/acpi_fm350gl.c
+++ b/src/drivers/wwan/fm/acpi_fm350gl.c
@@ -392,6 +392,6 @@
 }
 
 struct chip_operations drivers_wwan_fm_ops = {
-	 CHIP_NAME("Fibocom FM-350-GL")
+	 .name = "Fibocom FM-350-GL",
 	.enable_dev = wwan_fm350gl_acpi_enable
 };
diff --git a/src/ec/51nb/npce985la0dx/npce985la0dx.c b/src/ec/51nb/npce985la0dx/npce985la0dx.c
index 06db530..d81ea90 100644
--- a/src/ec/51nb/npce985la0dx/npce985la0dx.c
+++ b/src/ec/51nb/npce985la0dx/npce985la0dx.c
@@ -17,6 +17,6 @@
 }
 
 struct chip_operations ec_51nb_npce985la0dx_ops = {
-	CHIP_NAME("51NB EC")
+	.name = "51NB EC",
 	.enable_dev = ec_51nb_npce985la0dx_ops_enable,
 };
diff --git a/src/ec/clevo/it5570e/ec.c b/src/ec/clevo/it5570e/ec.c
index 4f10750..d49bf36 100644
--- a/src/ec/clevo/it5570e/ec.c
+++ b/src/ec/clevo/it5570e/ec.c
@@ -123,6 +123,6 @@
 }
 
 struct chip_operations ec_clevo_it5570e_ops = {
-	CHIP_NAME("Clevo IT5570E EC")
+	.name = "Clevo IT5570E EC",
 	.enable_dev = enable_dev,
 };
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index 6389383..37f26b1 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -131,6 +131,6 @@
 }
 
 struct chip_operations ec_compal_ene932_ops = {
-	CHIP_NAME("COMPAL ENE932 EC")
+	.name = "COMPAL ENE932 EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/ec/dell/mec5035/mec5035.c b/src/ec/dell/mec5035/mec5035.c
index eec79fb..68b6b2f 100644
--- a/src/ec/dell/mec5035/mec5035.c
+++ b/src/ec/dell/mec5035/mec5035.c
@@ -131,6 +131,6 @@
 }
 
 struct chip_operations ec_dell_mec5035_ops = {
-	CHIP_NAME("MEC5035 EC")
+	.name = "MEC5035 EC",
 	.enable_dev = mec5035_enable,
 };
diff --git a/src/ec/google/chromeec/audio_codec/audio_codec.c b/src/ec/google/chromeec/audio_codec/audio_codec.c
index 53037eb..a8def98 100644
--- a/src/ec/google/chromeec/audio_codec/audio_codec.c
+++ b/src/ec/google/chromeec/audio_codec/audio_codec.c
@@ -59,6 +59,6 @@
 }
 
 struct chip_operations ec_google_chromeec_audio_codec_ops = {
-	CHIP_NAME("CrosEC Audio Codec Device")
+	.name = "CrosEC Audio Codec Device",
 	.enable_dev = crosec_audio_codec_enable
 };
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 080b95d..2a9eabb 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -451,7 +451,7 @@
 }
 
 struct chip_operations ec_google_chromeec_ops = {
-	CHIP_NAME("Google Chrome EC")
+	.name = "Google Chrome EC",
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
index e61ecfd8..64812d4 100644
--- a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
+++ b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
@@ -65,6 +65,6 @@
 }
 
 struct chip_operations ec_google_chromeec_i2c_tunnel_ops = {
-	CHIP_NAME("CrosEC I2C Tunnel Device")
+	.name = "CrosEC I2C Tunnel Device",
 	.enable_dev = crosec_i2c_tunnel_enable
 };
diff --git a/src/ec/google/chromeec/mux/conn/conn.c b/src/ec/google/chromeec/mux/conn/conn.c
index e179c33..bb3129b 100644
--- a/src/ec/google/chromeec/mux/conn/conn.c
+++ b/src/ec/google/chromeec/mux/conn/conn.c
@@ -52,6 +52,6 @@
 }
 
 struct chip_operations ec_google_chromeec_mux_conn_ops = {
-	CHIP_NAME("CrosEC Type C Mux device")
+	.name = "CrosEC Type C Mux device",
 	.enable_dev	= conn_enable,
 };
diff --git a/src/ec/google/chromeec/mux/mux.c b/src/ec/google/chromeec/mux/mux.c
index 9324d2e..62be238 100644
--- a/src/ec/google/chromeec/mux/mux.c
+++ b/src/ec/google/chromeec/mux/mux.c
@@ -36,6 +36,6 @@
 }
 
 struct chip_operations ec_google_chromeec_mux_ops = {
-	CHIP_NAME("CrosEC Type C Mux device")
+	.name = "CrosEC Type C Mux device",
 	.enable_dev = mux_enable
 };
diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c
index 88d416d..3c70294 100644
--- a/src/ec/google/wilco/chip.c
+++ b/src/ec/google/wilco/chip.c
@@ -230,6 +230,6 @@
 }
 
 struct chip_operations ec_google_wilco_ops = {
-	CHIP_NAME("Google Wilco EC")
+	.name = "Google Wilco EC",
 	.enable_dev = wilco_ec_enable_dev,
 };
diff --git a/src/ec/hp/kbc1126/ec.c b/src/ec/hp/kbc1126/ec.c
index 8035b94..2a71079 100644
--- a/src/ec/hp/kbc1126/ec.c
+++ b/src/ec/hp/kbc1126/ec.c
@@ -120,6 +120,6 @@
 }
 
 struct chip_operations ec_hp_kbc1126_ops = {
-	CHIP_NAME("SMSC KBC1126 for HP laptops")
+	.name = "SMSC KBC1126 for HP laptops",
 	.enable_dev = kbc1126_enable
 };
diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c
index 5288976..1d67808 100644
--- a/src/ec/kontron/it8516e/ec.c
+++ b/src/ec/kontron/it8516e/ec.c
@@ -239,6 +239,6 @@
 }
 
 const struct chip_operations ec_kontron_it8516e_ops = {
-	CHIP_NAME("Kontron (Fintec/ITE) IT8516E EC")
+	.name = "Kontron (Fintec/ITE) IT8516E EC",
 	.enable_dev = it8516e_enable
 };
diff --git a/src/ec/kontron/kempld/kempld.c b/src/ec/kontron/kempld/kempld.c
index 9527429..7050ff4 100644
--- a/src/ec/kontron/kempld/kempld.c
+++ b/src/ec/kontron/kempld/kempld.c
@@ -105,6 +105,6 @@
 }
 
 struct chip_operations ec_kontron_kempld_ops = {
-	CHIP_NAME("Kontron KEMPLD")
+	.name = "Kontron KEMPLD",
 	.enable_dev = kempld_enable_dev,
 };
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 9b7bcc3..35ca1d9 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -325,6 +325,6 @@
 }
 
 struct chip_operations ec_lenovo_h8_ops = {
-	CHIP_NAME("Lenovo H8 EC")
+	.name = "Lenovo H8 EC",
 	.enable_dev = h8_enable,
 };
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index fa24c68..95502f3 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -126,6 +126,6 @@
 }
 
 struct chip_operations ec_lenovo_pmh7_ops = {
-	CHIP_NAME("Lenovo Power Management Hardware Hub 7")
+	.name = "Lenovo Power Management Hardware Hub 7",
 	.enable_dev = enable_dev,
 };
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 4b4f532..50bdaa3 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -141,6 +141,6 @@
 }
 
 struct chip_operations ec_quanta_ene_kb3940q_ops = {
-	CHIP_NAME("QUANTA EnE KB3940Q EC")
+	.name = "QUANTA EnE KB3940Q EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 80aaa5d..dfa8c50 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -154,6 +154,6 @@
 }
 
 struct chip_operations ec_quanta_it8518_ops = {
-	CHIP_NAME("QUANTA IT8518 EC")
+	.name = "QUANTA IT8518 EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/ec/roda/it8518/ec.c b/src/ec/roda/it8518/ec.c
index cbeb210..9f877f7 100644
--- a/src/ec/roda/it8518/ec.c
+++ b/src/ec/roda/it8518/ec.c
@@ -48,6 +48,6 @@
 }
 
 struct chip_operations ec_roda_it8518_ops = {
-	CHIP_NAME("Roda IT8518 EC")
+	.name = "Roda IT8518 EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c
index fb09aa5..39f3fbe 100644
--- a/src/ec/smsc/mec1308/ec.c
+++ b/src/ec/smsc/mec1308/ec.c
@@ -112,6 +112,6 @@
 }
 
 struct chip_operations ec_smsc_mec1308_ops = {
-	CHIP_NAME("SMSC MEC1308 EC Mailbox Interface")
+	.name = "SMSC MEC1308 EC Mailbox Interface",
 	.enable_dev = mec1308_enable
 };
diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index daf5873..dec9766 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -322,6 +322,6 @@
 }
 
 struct chip_operations ec_starlabs_merlin_ops = {
-	CHIP_NAME("ITE EC")
+	.name = "ITE EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/ec/starlabs/merlin/nuvoton.c b/src/ec/starlabs/merlin/nuvoton.c
index bad8d1b..d0b119f 100644
--- a/src/ec/starlabs/merlin/nuvoton.c
+++ b/src/ec/starlabs/merlin/nuvoton.c
@@ -297,6 +297,6 @@
 }
 
 struct chip_operations ec_starlabs_merlin_ops = {
-	CHIP_NAME("NUVOTON EC")
+	.name = "NUVOTON EC",
 	.enable_dev = enable_dev
 };
diff --git a/src/include/device/device.h b/src/include/device/device.h
index b7917e3..7e52f41 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -34,8 +34,6 @@
 	const char *name;
 };
 
-#define CHIP_NAME(X) .name = X,
-
 struct bus;
 
 struct acpi_rsdp;
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 5fe12e7..6c26366 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -276,11 +276,11 @@
 }
 
 struct chip_operations mainboard_emulation_qemu_i440fx_ops = {
-	CHIP_NAME("QEMU Northbridge i440fx")
+	.name = "QEMU Northbridge i440fx",
 	.enable_dev = northbridge_enable,
 };
 
 struct chip_operations mainboard_emulation_qemu_q35_ops = {
-	CHIP_NAME("QEMU Northbridge q35")
+	.name = "QEMU Northbridge q35",
 	.enable_dev = northbridge_enable,
 };
diff --git a/src/mainboard/supermicro/x10slm-f/mainboard.c b/src/mainboard/supermicro/x10slm-f/mainboard.c
index 98548e3..37c1eb4 100644
--- a/src/mainboard/supermicro/x10slm-f/mainboard.c
+++ b/src/mainboard/supermicro/x10slm-f/mainboard.c
@@ -35,6 +35,6 @@
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("X10SLM+-F")
+	.name = "X10SLM+-F",
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 5e82ccd..7e9cfd8 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -692,7 +692,7 @@
 };
 
 struct chip_operations northbridge_amd_pi_00730F01_ops = {
-	CHIP_NAME("AMD FAM16 Root Complex")
+	.name = "AMD FAM16 Root Complex",
 	.final = fam16_finalize,
 };
 
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 65a0212..fa29ef5 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -70,5 +70,5 @@
 };
 
 struct chip_operations northbridge_intel_e7505_ops = {
-	CHIP_NAME("Intel E7505 Northbridge")
+	.name = "Intel E7505 Northbridge",
 };
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 4bddf20..50d0d89 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -233,7 +233,7 @@
 }
 
 struct chip_operations northbridge_intel_gm45_ops = {
-	CHIP_NAME("Intel GM45 Northbridge")
+	.name = "Intel GM45 Northbridge",
 	.init = gm45_init,
 };
 
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index ef5b9e9..c544ad3 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -542,5 +542,5 @@
 };
 
 struct chip_operations northbridge_intel_haswell_ops = {
-	CHIP_NAME("Intel Haswell integrated Northbridge")
+	.name = "Intel Haswell integrated Northbridge",
 };
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 0670f72..d588197 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -105,6 +105,6 @@
 }
 
 struct chip_operations northbridge_intel_i440bx_ops = {
-	CHIP_NAME("Intel 82443BX (440BX) Northbridge")
+	.name = "Intel 82443BX (440BX) Northbridge",
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 1dfcc40..34ebcb2 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -134,7 +134,7 @@
 };
 
 struct chip_operations northbridge_intel_i945_ops = {
-	CHIP_NAME("Intel i945 Northbridge")
+	.name = "Intel i945 Northbridge",
 };
 
 bool northbridge_support_slfm(void)
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 74ddee2..e6bc375 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -217,6 +217,6 @@
 };
 
 struct chip_operations northbridge_intel_ironlake_ops = {
-	CHIP_NAME("Intel Ironlake integrated Northbridge")
+	.name = "Intel Ironlake integrated Northbridge",
 	.init = ironlake_init,
 };
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index a23a0d5..d7a6c84 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -159,6 +159,6 @@
 }
 
 struct chip_operations northbridge_intel_pineview_ops = {
-	CHIP_NAME("Intel Pineview Northbridge")
+	.name = "Intel Pineview Northbridge",
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 6b89710..3db9086 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -407,5 +407,5 @@
 };
 
 struct chip_operations northbridge_intel_sandybridge_ops = {
-	CHIP_NAME("Intel SandyBridge/IvyBridge integrated Northbridge")
+	.name = "Intel SandyBridge/IvyBridge integrated Northbridge",
 };
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 12a7a40..b037cf8 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -154,7 +154,7 @@
 }
 
 struct chip_operations northbridge_intel_x4x_ops = {
-	CHIP_NAME("Intel 4-Series Northbridge")
+	.name = "Intel 4-Series Northbridge",
 	.init = x4x_init,
 };
 
diff --git a/src/soc/amd/cezanne/chip.c b/src/soc/amd/cezanne/chip.c
index 4be0a82..ffbd94a 100644
--- a/src/soc/amd/cezanne/chip.c
+++ b/src/soc/amd/cezanne/chip.c
@@ -50,7 +50,7 @@
 }
 
 struct chip_operations soc_amd_cezanne_ops = {
-	CHIP_NAME("AMD Cezanne SoC")
+	.name = "AMD Cezanne SoC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/amd/genoa_poc/chip.c b/src/soc/amd/genoa_poc/chip.c
index 83d2bc9..d397800 100644
--- a/src/soc/amd/genoa_poc/chip.c
+++ b/src/soc/amd/genoa_poc/chip.c
@@ -21,7 +21,7 @@
 }
 
 struct chip_operations soc_amd_genoa_poc_ops = {
-	CHIP_NAME("AMD Genoa SoC Proof of Concept")
+	.name = "AMD Genoa SoC Proof of Concept",
 	.init = soc_init,
 	.final = soc_final,
 };
diff --git a/src/soc/amd/glinda/chip.c b/src/soc/amd/glinda/chip.c
index 0f49f6a..13933c7 100644
--- a/src/soc/amd/glinda/chip.c
+++ b/src/soc/amd/glinda/chip.c
@@ -52,7 +52,7 @@
 }
 
 struct chip_operations soc_amd_glinda_ops = {
-	CHIP_NAME("AMD Glinda SoC")
+	.name = "AMD Glinda SoC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/amd/mendocino/chip.c b/src/soc/amd/mendocino/chip.c
index f724e20..0bb9637 100644
--- a/src/soc/amd/mendocino/chip.c
+++ b/src/soc/amd/mendocino/chip.c
@@ -50,7 +50,7 @@
 }
 
 struct chip_operations soc_amd_mendocino_ops = {
-	CHIP_NAME("AMD Mendocino SoC")
+	.name = "AMD Mendocino SoC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/amd/phoenix/chip.c b/src/soc/amd/phoenix/chip.c
index 173b220..72652ba 100644
--- a/src/soc/amd/phoenix/chip.c
+++ b/src/soc/amd/phoenix/chip.c
@@ -52,7 +52,7 @@
 }
 
 struct chip_operations soc_amd_phoenix_ops = {
-	CHIP_NAME("AMD Phoenix SoC")
+	.name = "AMD Phoenix SoC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 4f30582..d896a83 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -50,7 +50,7 @@
 }
 
 struct chip_operations soc_amd_picasso_ops = {
-	CHIP_NAME("AMD Picasso SOC")
+	.name = "AMD Picasso SOC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 09cede3..05beaff 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -100,7 +100,7 @@
 }
 
 struct chip_operations soc_amd_stoneyridge_ops = {
-	CHIP_NAME("AMD StoneyRidge SOC")
+	.name = "AMD StoneyRidge SOC",
 	.init = soc_init,
 	.final = soc_final
 };
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index ed1441b..5e606d3 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -394,6 +394,6 @@
 }
 
 struct chip_operations soc_cavium_cn81xx_ops = {
-	CHIP_NAME("SOC Cavium CN81XX")
+	.name = "SOC Cavium CN81XX",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/cavium/common/pci/uart.c b/src/soc/cavium/common/pci/uart.c
index 4ee1cdf..af59e2b 100644
--- a/src/soc/cavium/common/pci/uart.c
+++ b/src/soc/cavium/common/pci/uart.c
@@ -26,5 +26,5 @@
 };
 
 struct chip_operations soc_cavium_common_pci_ops = {
-	CHIP_NAME("Cavium ThunderX UART")
+	.name = "Cavium ThunderX UART",
 };
diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c
index 0639157..45fb39f 100644
--- a/src/soc/intel/alderlake/chip.c
+++ b/src/soc/intel/alderlake/chip.c
@@ -286,7 +286,7 @@
 }
 
 struct chip_operations soc_intel_alderlake_ops = {
-	CHIP_NAME("Intel Alderlake")
+	.name = "Intel Alderlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 07c2637..469b9be 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -759,7 +759,7 @@
 }
 
 struct chip_operations soc_intel_apollolake_ops = {
-	CHIP_NAME("Intel Apollolake SOC")
+	.name = "Intel Apollolake SOC",
 	.enable_dev = &enable_dev,
 	.init = &soc_init,
 	.final = &soc_final
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index 592e178..fdfd129 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -43,7 +43,7 @@
 }
 
 struct chip_operations soc_intel_baytrail_ops = {
-	CHIP_NAME("Intel BayTrail SoC")
+	.name = "Intel BayTrail SoC",
 	.enable_dev = enable_dev,
 	.init = soc_init,
 };
diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index d3c41f8..407b6ea 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -294,7 +294,7 @@
 }
 
 struct chip_operations soc_intel_braswell_ops = {
-	CHIP_NAME("Intel Braswell SoC")
+	.name = "Intel Braswell SoC",
 	.enable_dev = enable_dev,
 	.init       = soc_init,
 };
diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c
index 6525275..3d2574b 100644
--- a/src/soc/intel/broadwell/northbridge.c
+++ b/src/soc/intel/broadwell/northbridge.c
@@ -419,6 +419,6 @@
 }
 
 struct chip_operations soc_intel_broadwell_ops = {
-	CHIP_NAME("Intel Broadwell")
+	.name = "Intel Broadwell",
 	.init       = &broadwell_init_pre_device,
 };
diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c
index 98fbc46..ddb51cc 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -196,7 +196,7 @@
 }
 
 struct chip_operations soc_intel_broadwell_pch_ops = {
-	CHIP_NAME("Intel Broadwell PCH")
+	.name = "Intel Broadwell PCH",
 	.enable_dev = &broadwell_pch_enable_dev,
 };
 
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 0da6e40..bda66bd 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -206,7 +206,7 @@
 }
 
 struct chip_operations soc_intel_cannonlake_ops = {
-	CHIP_NAME("Intel Cannonlake")
+	.name = "Intel Cannonlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/common/block/pcie/rtd3/rtd3.c b/src/soc/intel/common/block/pcie/rtd3/rtd3.c
index abd7e466..39c82b1 100644
--- a/src/soc/intel/common/block/pcie/rtd3/rtd3.c
+++ b/src/soc/intel/common/block/pcie/rtd3/rtd3.c
@@ -567,6 +567,6 @@
 }
 
 struct chip_operations soc_intel_common_block_pcie_rtd3_ops = {
-	CHIP_NAME("Intel PCIe Runtime D3")
+	.name = "Intel PCIe Runtime D3",
 	.enable_dev = pcie_rtd3_acpi_enable
 };
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 533fbee..c03f5a9 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -433,7 +433,7 @@
 }
 
 struct chip_operations soc_intel_common_block_uart_ops = {
-	CHIP_NAME("LPSS UART in ACPI mode")
+	.name = "LPSS UART in ACPI mode",
 	.enable_dev = uart_enable
 };
 
diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c
index 0139647..f2414cc 100644
--- a/src/soc/intel/common/block/usb4/pcie.c
+++ b/src/soc/intel/common/block/usb4/pcie.c
@@ -81,6 +81,6 @@
 }
 
 struct chip_operations soc_intel_common_block_usb4_ops = {
-	CHIP_NAME("Intel USB4 PCIe Root Port")
+	.name = "Intel USB4 PCIe Root Port",
 	.enable_dev = usb4_pcie_acpi_enable
 };
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index 1a4341e..1016460 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -187,7 +187,7 @@
 }
 
 struct chip_operations soc_intel_denverton_ns_ops = {
-	CHIP_NAME("Intel Denverton-NS SOC")
+	.name = "Intel Denverton-NS SOC",
 	.enable_dev = soc_enable_dev,
 	.init = soc_init,
 	.final = soc_final
diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c
index 194591d..f9e4e0e 100644
--- a/src/soc/intel/elkhartlake/chip.c
+++ b/src/soc/intel/elkhartlake/chip.c
@@ -159,7 +159,7 @@
 }
 
 struct chip_operations soc_intel_elkhartlake_ops = {
-	CHIP_NAME("Intel Elkhartlake")
+	.name = "Intel Elkhartlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c
index c049163f..7b185c3 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -170,7 +170,7 @@
 }
 
 struct chip_operations soc_intel_jasperlake_ops = {
-	CHIP_NAME("Intel Jasperlake")
+	.name = "Intel Jasperlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c
index be957cc..03adfdb 100644
--- a/src/soc/intel/meteorlake/chip.c
+++ b/src/soc/intel/meteorlake/chip.c
@@ -276,7 +276,7 @@
 }
 
 struct chip_operations soc_intel_meteorlake_ops = {
-	CHIP_NAME("Intel Meteorlake")
+	.name = "Intel Meteorlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 	.final		= &soc_init_final_device,
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 8df1ad3..f471edb 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -212,7 +212,7 @@
 }
 
 struct chip_operations soc_intel_skylake_ops = {
-	CHIP_NAME("Intel 6th Gen")
+	.name = "Intel 6th Gen",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index dd24679..c94e727 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -222,7 +222,7 @@
 }
 
 struct chip_operations soc_intel_tigerlake_ops = {
-	CHIP_NAME("Intel Tigerlake")
+	.name = "Intel Tigerlake",
 	.enable_dev	= &soc_enable,
 	.init		= &soc_init_pre_device,
 };
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index 39a7eba..1e84dd5 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -186,7 +186,7 @@
 }
 
 struct chip_operations soc_intel_xeon_sp_cpx_ops = {
-	CHIP_NAME("Intel Cooper Lake-SP")
+	.name = "Intel Cooper Lake-SP",
 	.enable_dev = chip_enable_dev,
 	.init = chip_init,
 	.final = chip_final,
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index b468842..68737ed 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -89,7 +89,7 @@
 }
 
 struct chip_operations soc_intel_xeon_sp_skx_ops = {
-	CHIP_NAME("Intel Skylake-SP")
+	.name = "Intel Skylake-SP",
 	.enable_dev = soc_enable_dev,
 	.init = soc_init,
 	.final = soc_final
diff --git a/src/soc/intel/xeon_sp/spr/chip.c b/src/soc/intel/xeon_sp/spr/chip.c
index 3b3c65e..abab0d2 100644
--- a/src/soc/intel/xeon_sp/spr/chip.c
+++ b/src/soc/intel/xeon_sp/spr/chip.c
@@ -159,7 +159,8 @@
 }
 
 struct chip_operations soc_intel_xeon_sp_spr_ops = {
-	CHIP_NAME("Intel SapphireRapids-SP").enable_dev = chip_enable_dev,
+	.name = "Intel SapphireRapids-SP",
+	.enable_dev = chip_enable_dev,
 	.init = chip_init,
 	.final = chip_final,
 };
diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c
index ebdf4e5..f6ee122 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -45,6 +45,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8173_ops = {
-	CHIP_NAME("SOC Mediatek MT8173")
+	.name = "SOC Mediatek MT8173",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/mediatek/mt8183/soc.c b/src/soc/mediatek/mt8183/soc.c
index 32ec4e4..38323f7 100644
--- a/src/soc/mediatek/mt8183/soc.c
+++ b/src/soc/mediatek/mt8183/soc.c
@@ -33,6 +33,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8183_ops = {
-	CHIP_NAME("SOC Mediatek MT8183")
+	.name = "SOC Mediatek MT8183",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/mediatek/mt8186/soc.c b/src/soc/mediatek/mt8186/soc.c
index a55e2ee..ada794f 100644
--- a/src/soc/mediatek/mt8186/soc.c
+++ b/src/soc/mediatek/mt8186/soc.c
@@ -50,6 +50,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8186_ops = {
-	CHIP_NAME("SOC Mediatek MT8186")
+	.name = "SOC Mediatek MT8186",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/mediatek/mt8188/soc.c b/src/soc/mediatek/mt8188/soc.c
index d0a29c5..35071d5 100644
--- a/src/soc/mediatek/mt8188/soc.c
+++ b/src/soc/mediatek/mt8188/soc.c
@@ -65,6 +65,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8188_ops = {
-	CHIP_NAME("SOC Mediatek MT8188")
+	.name = "SOC Mediatek MT8188",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/mediatek/mt8192/soc.c b/src/soc/mediatek/mt8192/soc.c
index 74d2579..a84cf4a 100644
--- a/src/soc/mediatek/mt8192/soc.c
+++ b/src/soc/mediatek/mt8192/soc.c
@@ -47,6 +47,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8192_ops = {
-	CHIP_NAME("SOC Mediatek MT8192")
+	.name = "SOC Mediatek MT8192",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/mediatek/mt8195/soc.c b/src/soc/mediatek/mt8195/soc.c
index 5425695..20a9811 100644
--- a/src/soc/mediatek/mt8195/soc.c
+++ b/src/soc/mediatek/mt8195/soc.c
@@ -70,6 +70,6 @@
 }
 
 struct chip_operations soc_mediatek_mt8195_ops = {
-	CHIP_NAME("SOC Mediatek MT8195")
+	.name = "SOC Mediatek MT8195",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index 64fb868..1de8ab3 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -47,6 +47,6 @@
 }
 
 struct chip_operations soc_nvidia_tegra124_ops = {
-	CHIP_NAME("SOC Nvidia Tegra124")
+	.name = "SOC Nvidia Tegra124",
 	.enable_dev = enable_tegra124_dev,
 };
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index b037bdf..e207da6 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -80,7 +80,7 @@
 }
 
 struct chip_operations soc_nvidia_tegra210_ops = {
-	CHIP_NAME("SOC Nvidia Tegra210")
+	.name = "SOC Nvidia Tegra210",
 	.init = tegra210_init,
 	.enable_dev = enable_tegra210_dev,
 };
diff --git a/src/soc/qualcomm/ipq40xx/soc.c b/src/soc/qualcomm/ipq40xx/soc.c
index f482cff..ff074b7 100644
--- a/src/soc/qualcomm/ipq40xx/soc.c
+++ b/src/soc/qualcomm/ipq40xx/soc.c
@@ -49,6 +49,6 @@
 }
 
 struct chip_operations soc_qualcomm_ipq40xx_ops = {
-	CHIP_NAME("SOC QCA 40xx")
+	.name = "SOC QCA 40xx",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/qualcomm/ipq806x/soc.c b/src/soc/qualcomm/ipq806x/soc.c
index ad0510f..b0c05c9 100644
--- a/src/soc/qualcomm/ipq806x/soc.c
+++ b/src/soc/qualcomm/ipq806x/soc.c
@@ -39,6 +39,6 @@
 }
 
 struct chip_operations soc_qualcomm_ipq806x_ops = {
-	CHIP_NAME("SOC Qualcomm 8064")
+	.name = "SOC Qualcomm 8064",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/qualcomm/qcs405/soc.c b/src/soc/qualcomm/qcs405/soc.c
index f1a2def..18bf698 100644
--- a/src/soc/qualcomm/qcs405/soc.c
+++ b/src/soc/qualcomm/qcs405/soc.c
@@ -27,6 +27,6 @@
 }
 
 struct chip_operations soc_qualcomm_qcs405_ops = {
-	CHIP_NAME("SOC Qualcomm QCS405")
+	.name = "SOC Qualcomm QCS405",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/qualcomm/sc7180/soc.c b/src/soc/qualcomm/sc7180/soc.c
index cef7e8f..f81eeea 100644
--- a/src/soc/qualcomm/sc7180/soc.c
+++ b/src/soc/qualcomm/sc7180/soc.c
@@ -36,6 +36,6 @@
 }
 
 struct chip_operations soc_qualcomm_sc7180_ops = {
-	CHIP_NAME("SOC Qualcomm SC7180")
+	.name = "SOC Qualcomm SC7180",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/qualcomm/sc7280/soc.c b/src/soc/qualcomm/sc7280/soc.c
index 783c557..8dd53cc 100644
--- a/src/soc/qualcomm/sc7280/soc.c
+++ b/src/soc/qualcomm/sc7280/soc.c
@@ -53,6 +53,6 @@
 }
 
 struct chip_operations soc_qualcomm_sc7280_ops = {
-	CHIP_NAME("SOC Qualcomm SC7280")
+	.name = "SOC Qualcomm SC7280",
 	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index 20f5cec..8704d16 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -33,6 +33,6 @@
 }
 
 struct chip_operations soc_rockchip_rk3288_ops = {
-	CHIP_NAME("SOC Rockchip 3288")
+	.name = "SOC Rockchip 3288",
 	.enable_dev = enable_rk3288_dev,
 };
diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c
index 03c39a9..0937e8f 100644
--- a/src/soc/rockchip/rk3399/soc.c
+++ b/src/soc/rockchip/rk3399/soc.c
@@ -46,6 +46,6 @@
 }
 
 struct chip_operations soc_rockchip_rk3399_ops = {
-	CHIP_NAME("SOC Rockchip RK3399")
-	    .enable_dev = enable_soc_dev,
+	.name = "SOC Rockchip RK3399",
+	.enable_dev = enable_soc_dev,
 };
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index 06c9423..bbf04d9 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -128,7 +128,7 @@
 }
 
 struct chip_operations soc_samsung_exynos5250_ops = {
-	CHIP_NAME("SOC Samsung Exynos 5250")
+	.name = "SOC Samsung Exynos 5250",
 	.enable_dev = enable_exynos5250_dev,
 };
 
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index 7869ab8..b55cb34 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -156,6 +156,6 @@
 }
 
 struct chip_operations soc_samsung_exynos5420_ops = {
-	CHIP_NAME("SOC Samsung Exynos 5420")
+	.name = "SOC Samsung Exynos 5420",
 	.enable_dev = enable_exynos5420_dev,
 };
diff --git a/src/soc/sifive/fu540/chip.c b/src/soc/sifive/fu540/chip.c
index 6eab45c..e33b4a3 100644
--- a/src/soc/sifive/fu540/chip.c
+++ b/src/soc/sifive/fu540/chip.c
@@ -3,5 +3,5 @@
 #include <device/device.h>
 
 struct chip_operations soc_sifive_fu540_ops = {
-	CHIP_NAME("SIFIVE FU540")
+	.name = "SIFIVE FU540",
 };
diff --git a/src/soc/ti/am335x/soc.c b/src/soc/ti/am335x/soc.c
index 410b2d7..b409ab0 100644
--- a/src/soc/ti/am335x/soc.c
+++ b/src/soc/ti/am335x/soc.c
@@ -10,6 +10,6 @@
 }
 
 struct chip_operations soc_ti_am335x_ops = {
-	CHIP_NAME("TI AM335X")
+	.name = "TI AM335X",
 	.enable_dev = soc_enable,
 };
diff --git a/src/soc/ucb/riscv/chip.c b/src/soc/ucb/riscv/chip.c
index 187e96d..2e0f528 100644
--- a/src/soc/ucb/riscv/chip.c
+++ b/src/soc/ucb/riscv/chip.c
@@ -3,5 +3,5 @@
 #include <device/device.h>
 
 struct chip_operations soc_ucb_riscv_ops = {
-	CHIP_NAME("UCB RISC-V")
+	.name = "UCB RISC-V",
 };
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index 59e293f..26fb258 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -92,7 +92,7 @@
 }
 
 struct chip_operations southbridge_amd_pi_hudson_ops = {
-	CHIP_NAME("ATI HUDSON")
+	.name = "ATI HUDSON",
 	.enable_dev = hudson_enable,
 	.init = hudson_init,
 	.final = hudson_final
diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c
index 32ed5cd..1a9c2ae 100644
--- a/src/southbridge/intel/bd82x6x/pch.c
+++ b/src/southbridge/intel/bd82x6x/pch.c
@@ -358,6 +358,6 @@
 }
 
 struct chip_operations southbridge_intel_bd82x6x_ops = {
-	CHIP_NAME("Intel Series 6/7 (Cougar Point/Panther Point) Southbridge")
+	.name = "Intel Series 6/7 (Cougar Point/Panther Point) Southbridge",
 	.enable_dev = pch_enable,
 };
diff --git a/src/southbridge/intel/i82371eb/i82371eb.c b/src/southbridge/intel/i82371eb/i82371eb.c
index ce07152..7c96fc3 100644
--- a/src/southbridge/intel/i82371eb/i82371eb.c
+++ b/src/southbridge/intel/i82371eb/i82371eb.c
@@ -35,5 +35,5 @@
 #include <device/device.h>
 
 const struct chip_operations southbridge_intel_i82371eb_ops = {
-	CHIP_NAME("Intel 82371FB/SB/MX/AB/EB/MB Southbridge")
+	.name = "Intel 82371FB/SB/MX/AB/EB/MB Southbridge",
 };
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index ea90656..7a70902 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -64,6 +64,6 @@
 }
 
 struct chip_operations southbridge_intel_i82801dx_ops = {
-	CHIP_NAME("Intel ICH4/ICH4-M (82801Dx) Series Southbridge")
-	    .enable_dev = i82801dx_enable,
+	.name = "Intel ICH4/ICH4-M (82801Dx) Series Southbridge",
+	.enable_dev = i82801dx_enable,
 };
diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c
index 4783099..86db048 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.c
+++ b/src/southbridge/intel/i82801gx/i82801gx.c
@@ -83,7 +83,7 @@
 }
 
 struct chip_operations southbridge_intel_i82801gx_ops = {
-	CHIP_NAME("Intel ICH7/ICH7-M (82801Gx) Series Southbridge")
+	.name = "Intel ICH7/ICH7-M (82801Gx) Series Southbridge",
 	.enable_dev =	i82801gx_enable,
 	.init =		i82801gx_init,
 };
diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c
index 846c9d8..3d56594 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.c
+++ b/src/southbridge/intel/i82801ix/i82801ix.c
@@ -203,7 +203,7 @@
 }
 
 struct chip_operations southbridge_intel_i82801ix_ops = {
-	CHIP_NAME("Intel ICH9/ICH9-M (82801Ix) Series Southbridge")
+	.name = "Intel ICH9/ICH9-M (82801Ix) Series Southbridge",
 	.enable_dev	= i82801ix_enable_device,
 	.init		= i82801ix_init,
 };
diff --git a/src/southbridge/intel/i82801jx/i82801jx.c b/src/southbridge/intel/i82801jx/i82801jx.c
index 6f903014..6f10be0 100644
--- a/src/southbridge/intel/i82801jx/i82801jx.c
+++ b/src/southbridge/intel/i82801jx/i82801jx.c
@@ -194,7 +194,7 @@
 }
 
 struct chip_operations southbridge_intel_i82801jx_ops = {
-	CHIP_NAME("Intel ICH10 (82801Jx) Series Southbridge")
+	.name = "Intel ICH10 (82801Jx) Series Southbridge",
 	.enable_dev	= i82801jx_enable_device,
 	.init		= i82801jx_init,
 };
diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c
index 00bf6bb..4ca8010 100644
--- a/src/southbridge/intel/i82870/pcibridge.c
+++ b/src/southbridge/intel/i82870/pcibridge.c
@@ -38,5 +38,5 @@
 };
 
 struct chip_operations southbridge_intel_i82870_ops = {
-	CHIP_NAME("Intel 82870")
+	.name = "Intel 82870",
 };
diff --git a/src/southbridge/intel/ibexpeak/pch.c b/src/southbridge/intel/ibexpeak/pch.c
index 23768ed..f77dc62 100644
--- a/src/southbridge/intel/ibexpeak/pch.c
+++ b/src/southbridge/intel/ibexpeak/pch.c
@@ -84,6 +84,6 @@
 }
 
 struct chip_operations southbridge_intel_ibexpeak_ops = {
-	CHIP_NAME("Intel Series 5 (Ibexpeak) Southbridge")
+	.name = "Intel Series 5 (Ibexpeak) Southbridge",
 	.enable_dev = pch_enable,
 };
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index 8b037a9..ae4e714 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -199,7 +199,7 @@
 }
 
 struct chip_operations southbridge_intel_lynxpoint_ops = {
-	CHIP_NAME("Intel Series 8 (Lynx Point) Southbridge")
+	.name = "Intel Series 8 (Lynx Point) Southbridge",
 	.enable_dev = pch_enable,
 };
 
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index 23476ec..f78f816 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -215,6 +215,6 @@
 }
 
 struct chip_operations southbridge_ricoh_rl5c476_ops = {
-	CHIP_NAME("Ricoh RL5C476 CardBus Controller")
+	.name = "Ricoh RL5C476 CardBus Controller",
 	.enable_dev    = southbridge_init,
 };
diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c
index ccd3ce9..55d37af 100644
--- a/src/southbridge/ti/pci1x2x/pci1x2x.c
+++ b/src/southbridge/ti/pci1x2x/pci1x2x.c
@@ -73,5 +73,5 @@
 };
 
 struct chip_operations southbridge_ti_pci1x2x_ops = {
-	CHIP_NAME("TI PCI1x2x Cardbus controller")
+	.name = "TI PCI1x2x Cardbus controller",
 };
diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c
index 6ef08a3..16fdf44 100644
--- a/src/southbridge/ti/pci7420/cardbus.c
+++ b/src/southbridge/ti/pci7420/cardbus.c
@@ -80,5 +80,5 @@
 };
 
 struct chip_operations southbridge_ti_pci7420_ops = {
-	CHIP_NAME("Texas Instruments PCI7420/7620 Cardbus Controller")
+	.name = "Texas Instruments PCI7420/7620 Cardbus Controller",
 };
diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index 4510c21..51c6464 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -103,6 +103,6 @@
 }
 
 struct chip_operations superio_aspeed_ast2400_ops = {
-	CHIP_NAME("ASpeed AST2400/AST2500 Super I/O")
+	.name = "ASpeed AST2400/AST2500 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index c690340..1758acc 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -324,6 +324,6 @@
 }
 
 struct chip_operations superio_common_ops = {
-	CHIP_NAME("Generic Super I/O")
+	.name = "Generic Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/fintek/f71808a/superio.c b/src/superio/fintek/f71808a/superio.c
index 17fa379..885d3f7 100644
--- a/src/superio/fintek/f71808a/superio.c
+++ b/src/superio/fintek/f71808a/superio.c
@@ -51,6 +51,6 @@
 }
 
 struct chip_operations superio_fintek_f71808a_ops = {
-	CHIP_NAME("Fintek F71808A Super I/O")
+	.name = "Fintek F71808A Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 1f44249..628d4c9 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -33,6 +33,6 @@
 }
 
 struct chip_operations superio_fintek_f71859_ops = {
-	CHIP_NAME("Fintek F71859 Super I/O")
+	.name = "Fintek F71859 Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index c4e8dc9..6f1735d 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -50,6 +50,6 @@
 }
 
 struct chip_operations superio_fintek_f71863fg_ops = {
-	CHIP_NAME("Fintek F71863FG Super I/O")
+	.name = "Fintek F71863FG Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 3cfd387..a4affee 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -107,6 +107,6 @@
 }
 
 struct chip_operations superio_fintek_f71869ad_ops = {
-	CHIP_NAME("Fintek F71869AD Super I/O")
+	.name = "Fintek F71869AD Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f81803a/superio.c b/src/superio/fintek/f81803a/superio.c
index 5304f9e..4d4e8bc 100644
--- a/src/superio/fintek/f81803a/superio.c
+++ b/src/superio/fintek/f81803a/superio.c
@@ -57,6 +57,6 @@
 }
 
 struct chip_operations superio_fintek_f81803a_ops = {
-	CHIP_NAME("Fintek F81803A Super I/O")
+	.name = "Fintek F81803A Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 9181bad..70fefe5 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -48,6 +48,6 @@
 }
 
 struct chip_operations superio_fintek_f81865f_ops = {
-	CHIP_NAME("Fintek F81865F Super I/O")
+	.name = "Fintek F81865F Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f81866d/superio.c b/src/superio/fintek/f81866d/superio.c
index 3803230..6bcf311 100644
--- a/src/superio/fintek/f81866d/superio.c
+++ b/src/superio/fintek/f81866d/superio.c
@@ -73,6 +73,6 @@
 }
 
 struct chip_operations superio_fintek_f81866d_ops = {
-	CHIP_NAME("Fintek F81866AD-I Super I/O")
+	.name = "Fintek F81866AD-I Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/ite/it8528e/superio.c b/src/superio/ite/it8528e/superio.c
index d135c0b..97d8850 100644
--- a/src/superio/ite/it8528e/superio.c
+++ b/src/superio/ite/it8528e/superio.c
@@ -49,6 +49,6 @@
 }
 
 struct chip_operations superio_ite_it8528e_ops = {
-	CHIP_NAME("ITE IT8528E Super I/O")
+	.name = "ITE IT8528E Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8613e/superio.c b/src/superio/ite/it8613e/superio.c
index c18c3ec..78241b2 100644
--- a/src/superio/ite/it8613e/superio.c
+++ b/src/superio/ite/it8613e/superio.c
@@ -63,6 +63,6 @@
 }
 
 struct chip_operations superio_ite_it8613e_ops = {
-	CHIP_NAME("ITE IT8613E Super I/O")
+	.name = "ITE IT8613E Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8623e/superio.c b/src/superio/ite/it8623e/superio.c
index 15e0071..7800a34 100644
--- a/src/superio/ite/it8623e/superio.c
+++ b/src/superio/ite/it8623e/superio.c
@@ -60,6 +60,6 @@
 }
 
 struct chip_operations superio_ite_it8623e_ops = {
-	CHIP_NAME("ITE IT8623E Super I/O")
+	.name = "ITE IT8623E Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 17a1976..03127b5 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -65,6 +65,6 @@
 }
 
 struct chip_operations superio_ite_it8712f_ops = {
-	CHIP_NAME("ITE IT8712F Super I/O")
+	.name = "ITE IT8712F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 1243e75..fafe30d 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -71,6 +71,6 @@
 }
 
 struct chip_operations superio_ite_it8718f_ops = {
-	CHIP_NAME("ITE IT8718F Super I/O")
+	.name = "ITE IT8718F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c
index 75d0be9..4491c10 100644
--- a/src/superio/ite/it8720f/superio.c
+++ b/src/superio/ite/it8720f/superio.c
@@ -112,6 +112,6 @@
 }
 
 struct chip_operations superio_ite_it8720f_ops = {
-	CHIP_NAME("ITE IT8720F Super I/O")
+	.name = "ITE IT8720F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index f69e1b0..801e27b 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -63,6 +63,6 @@
 }
 
 struct chip_operations superio_ite_it8721f_ops = {
-	CHIP_NAME("ITE IT8721F Super I/O")
+	.name = "ITE IT8721F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c
index 67ef218..5e4c2fd 100644
--- a/src/superio/ite/it8728f/superio.c
+++ b/src/superio/ite/it8728f/superio.c
@@ -60,6 +60,6 @@
 }
 
 struct chip_operations superio_ite_it8728f_ops = {
-	CHIP_NAME("ITE IT8728F Super I/O")
+	.name = "ITE IT8728F Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 82f30fa..1771368 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -268,6 +268,6 @@
 }
 
 struct chip_operations superio_ite_it8772f_ops = {
-	CHIP_NAME("ITE IT8772F Super I/O")
+	.name = "ITE IT8772F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8783ef/superio.c b/src/superio/ite/it8783ef/superio.c
index d90ae5f..618ea3f 100644
--- a/src/superio/ite/it8783ef/superio.c
+++ b/src/superio/ite/it8783ef/superio.c
@@ -88,6 +88,6 @@
 }
 
 struct chip_operations superio_ite_it8783ef_ops = {
-	CHIP_NAME("ITE IT8783E/F Super I/O")
+	.name = "ITE IT8783E/F Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8784e/superio.c b/src/superio/ite/it8784e/superio.c
index 85fc42e..1caa837 100644
--- a/src/superio/ite/it8784e/superio.c
+++ b/src/superio/ite/it8784e/superio.c
@@ -82,6 +82,6 @@
 }
 
 struct chip_operations superio_ite_it8784e_ops = {
-	CHIP_NAME("ITE IT8784E Super I/O")
+	.name = "ITE IT8784E Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8786e/superio.c b/src/superio/ite/it8786e/superio.c
index 8d9ec14..f610fdf 100644
--- a/src/superio/ite/it8786e/superio.c
+++ b/src/superio/ite/it8786e/superio.c
@@ -98,6 +98,6 @@
 }
 
 struct chip_operations superio_ite_it8786e_ops = {
-	CHIP_NAME("ITE IT8786E Super I/O")
+	.name = "ITE IT8786E Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 355aca4..c60e845 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -41,6 +41,6 @@
 }
 
 struct chip_operations superio_nsc_pc87382_ops = {
-	CHIP_NAME("NSC PC87382 Docking LPC Switch")
+	.name = "NSC PC87382 Docking LPC Switch",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 88d4d36..60e0994 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -25,6 +25,6 @@
 }
 
 struct chip_operations superio_nsc_pc87384_ops = {
-	CHIP_NAME("NSC PC87384 Super I/O")
+	.name = "NSC PC87384 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index e65afea..551249d 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -35,6 +35,6 @@
 }
 
 struct chip_operations superio_nsc_pc87392_ops = {
-	CHIP_NAME("NSC PC87392 Super I/O")
+	.name = "NSC PC87392 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index be99f7f..ac01c46 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -46,6 +46,6 @@
 }
 
 struct chip_operations superio_nsc_pc87417_ops = {
-	CHIP_NAME("NSC PC87417 Super I/O")
+	.name = "NSC PC87417 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct5104d/superio.c b/src/superio/nuvoton/nct5104d/superio.c
index cfa2228..3353369 100644
--- a/src/superio/nuvoton/nct5104d/superio.c
+++ b/src/superio/nuvoton/nct5104d/superio.c
@@ -232,6 +232,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct5104d_ops = {
-	CHIP_NAME("Nuvoton NCT5104D Super I/O")
+	.name = "Nuvoton NCT5104D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c
index ff37f5c..cef40a5 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -95,6 +95,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct5539d_ops = {
-	CHIP_NAME("NUVOTON NCT5539D Super I/O")
+	.name = "NUVOTON NCT5539D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index 7e893ee..34fa016 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -104,6 +104,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct5572d_ops = {
-	CHIP_NAME("NUVOTON NCT5572D Super I/O")
+	.name = "NUVOTON NCT5572D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct6687d/superio.c b/src/superio/nuvoton/nct6687d/superio.c
index a2eea8c..c280927 100644
--- a/src/superio/nuvoton/nct6687d/superio.c
+++ b/src/superio/nuvoton/nct6687d/superio.c
@@ -87,6 +87,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct6687d_ops = {
-	CHIP_NAME("NUVOTON NCT6687D Super I/O")
+	.name = "NUVOTON NCT6687D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct6776/superio.c b/src/superio/nuvoton/nct6776/superio.c
index 4197d54..d98e303 100644
--- a/src/superio/nuvoton/nct6776/superio.c
+++ b/src/superio/nuvoton/nct6776/superio.c
@@ -67,6 +67,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct6776_ops = {
-	CHIP_NAME("NUVOTON NCT6776 Super I/O")
+	.name = "NUVOTON NCT6776 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct6779d/superio.c b/src/superio/nuvoton/nct6779d/superio.c
index 77058b0..1360476 100644
--- a/src/superio/nuvoton/nct6779d/superio.c
+++ b/src/superio/nuvoton/nct6779d/superio.c
@@ -62,6 +62,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct6779d_ops = {
-	CHIP_NAME("NUVOTON NCT6779D Super I/O")
+	.name = "NUVOTON NCT6779D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index 3244e05..91a3908 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -102,6 +102,6 @@
 }
 
 struct chip_operations superio_nuvoton_nct6791d_ops = {
-	CHIP_NAME("NUVOTON NCT6791D Super I/O")
+	.name = "NUVOTON NCT6791D Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 615bae5..a4759fb 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -460,6 +460,6 @@
 }
 
 struct chip_operations superio_nuvoton_npcd378_ops = {
-	CHIP_NAME("NUVOTON NPCD378 Super I/O")
+	.name = "NUVOTON NPCD378 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 45c2e93..863ad2b 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -40,6 +40,6 @@
 }
 
 struct chip_operations superio_nuvoton_wpcm450_ops = {
-	CHIP_NAME("Nuvoton WPCM450 Super I/O")
+	.name = "Nuvoton WPCM450 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 293fe0e..6b71256 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -45,6 +45,6 @@
 }
 
 struct chip_operations superio_renesas_m3885x_ops = {
-	CHIP_NAME("Renesas M3885x Super I/O")
+	.name = "Renesas M3885x Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/fdc37n972/superio.c b/src/superio/smsc/fdc37n972/superio.c
index a62bba8..ba197d8 100644
--- a/src/superio/smsc/fdc37n972/superio.c
+++ b/src/superio/smsc/fdc37n972/superio.c
@@ -46,6 +46,6 @@
 }
 
 struct chip_operations superio_smsc_fdc37n972_ops = {
-	CHIP_NAME("SMSC FDC37N972 Super I/O")
+	.name = "SMSC FDC37N972 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 862a77b..74f2326 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -14,7 +14,7 @@
 static void kbc1100_init(struct device *dev);
 
 struct chip_operations superio_smsc_kbc1100_ops = {
-	CHIP_NAME("SMSC KBC1100 Super I/O")
+	.name = "SMSC KBC1100 Super I/O",
 	.enable_dev = enable_dev
 };
 
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index cb297a5..157275e 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -58,6 +58,6 @@
 }
 
 struct chip_operations superio_smsc_lpc47m10x_ops = {
-	CHIP_NAME("SMSC LPC47M10x Super I/O")
+	.name = "SMSC LPC47M10x Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index e1e4883..6f57133 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -14,7 +14,7 @@
 static void lpc47m15x_init(struct device *dev);
 
 struct chip_operations superio_smsc_lpc47m15x_ops = {
-	CHIP_NAME("SMSC LPC47M15x/192/997 Super I/O")
+	.name = "SMSC LPC47M15x/192/997 Super I/O",
 	.enable_dev = enable_dev
 };
 
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index dcaf6e7..c59ce2d 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -25,7 +25,7 @@
 static void pnp_exit_conf_state(struct device *dev);
 
 struct chip_operations superio_smsc_lpc47n217_ops = {
-	CHIP_NAME("SMSC LPC47N217 Super I/O")
+	.name = "SMSC LPC47N217 Super I/O",
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 3712350..edcc271 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -24,7 +24,7 @@
 void lpc47n227_pnp_set_enable(struct device *dev, int enable);
 
 struct chip_operations superio_smsc_lpc47n227_ops = {
-	CHIP_NAME("SMSC LPC47N227 Super I/O")
+	.name = "SMSC LPC47N227 Super I/O",
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 6c8597c..39e100e 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -47,6 +47,6 @@
 }
 
 struct chip_operations superio_smsc_mec1308_ops = {
-	CHIP_NAME("SMSC MEC1308 EC SuperIO Interface")
+	.name = "SMSC MEC1308 EC SuperIO Interface",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/smsc/sch5545/superio.c b/src/superio/smsc/sch5545/superio.c
index 1ce1fd6..7b8e5a0 100644
--- a/src/superio/smsc/sch5545/superio.c
+++ b/src/superio/smsc/sch5545/superio.c
@@ -303,6 +303,6 @@
 }
 
 struct chip_operations superio_smsc_sch5545_ops = {
-	CHIP_NAME("SMSC SCH5545 Super I/O")
+	.name = "SMSC SCH5545 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/sch555x/ramstage.c b/src/superio/smsc/sch555x/ramstage.c
index 2245001..1cdd869 100644
--- a/src/superio/smsc/sch555x/ramstage.c
+++ b/src/superio/smsc/sch555x/ramstage.c
@@ -136,6 +136,6 @@
 }
 
 struct chip_operations superio_smsc_sch555x_ops = {
-	CHIP_NAME("SMSC SCH555x Super I/O")
+	.name = "SMSC SCH555x Super I/O",
 	.enable_dev = sch555x_enable_dev,
 };
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 3dcaae8..8b1704f 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -33,6 +33,6 @@
 }
 
 struct chip_operations superio_smsc_sio1036_ops = {
-	CHIP_NAME("SMSC SIO1036 Super I/O")
+	.name = "SMSC SIO1036 Super I/O",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/smsc/sio10n268/superio.c b/src/superio/smsc/sio10n268/superio.c
index ca5a0c6..fa79a57 100644
--- a/src/superio/smsc/sio10n268/superio.c
+++ b/src/superio/smsc/sio10n268/superio.c
@@ -43,6 +43,6 @@
 }
 
 struct chip_operations superio_smsc_sio10n268_ops = {
-	CHIP_NAME("SMSC SIO10N268 Super I/O")
+	.name = "SMSC SIO10N268 Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index a182d90..3ba8216 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -281,6 +281,6 @@
 }
 
 struct chip_operations superio_smsc_smscsuperio_ops = {
-	CHIP_NAME("Various SMSC Super I/Os")
+	.name = "Various SMSC Super I/Os",
 	.enable_dev = enable_dev
 };
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 2641cb3..491b5c9 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -68,6 +68,6 @@
 }
 
 struct chip_operations superio_winbond_w83627dhg_ops = {
-	CHIP_NAME("Winbond W83627DHG Super I/O")
+	.name = "Winbond W83627DHG Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 1e36048..03dce82 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -129,6 +129,6 @@
 }
 
 struct chip_operations superio_winbond_w83627ehg_ops = {
-	CHIP_NAME("Winbond W83627EHG Super I/O")
+	.name = "Winbond W83627EHG Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index de2a0c6..f0c5b28 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -129,6 +129,6 @@
 }
 
 struct chip_operations superio_winbond_w83627hf_ops = {
-	CHIP_NAME("Winbond W83627HF Super I/O")
+	.name = "Winbond W83627HF Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 4276da6..156239f 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -50,6 +50,6 @@
 }
 
 struct chip_operations superio_winbond_w83627thg_ops = {
-	CHIP_NAME("Winbond W83627THG Super I/O")
+	.name = "Winbond W83627THG Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 4b54bac..e276fc5 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -101,6 +101,6 @@
 }
 
 struct chip_operations superio_winbond_w83627uhg_ops = {
-	CHIP_NAME("Winbond W83627UHG Super I/O")
+	.name = "Winbond W83627UHG Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c
index a5abe61..4cddf20 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -103,6 +103,6 @@
 }
 
 struct chip_operations superio_winbond_w83667hg_a_ops = {
-	CHIP_NAME("WINBOND W83667HG-A Super I/O")
+	.name = "WINBOND W83667HG-A Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 4187b52..28bfc8c 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -50,6 +50,6 @@
 }
 
 struct chip_operations superio_winbond_w83977tf_ops = {
-	CHIP_NAME("Winbond W83977TF Super I/O")
+	.name = "Winbond W83977TF Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/wpcd376i/superio.c b/src/superio/winbond/wpcd376i/superio.c
index a692eeb..635d025 100644
--- a/src/superio/winbond/wpcd376i/superio.c
+++ b/src/superio/winbond/wpcd376i/superio.c
@@ -61,6 +61,6 @@
 }
 
 struct chip_operations superio_winbond_wpcd376i_ops = {
-	CHIP_NAME("Winbond WPCD376I Super I/O")
+	.name = "Winbond WPCD376I Super I/O",
 	.enable_dev = enable_dev,
 };
diff --git a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
index 89314ba..9e9e886 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
@@ -10,7 +10,7 @@
 #include "../opensil.h"
 
 struct chip_operations vendorcode_amd_opensil_genoa_poc_mpio_ops = {
-	CHIP_NAME("AMD GENOA MPIO")
+	.name = "AMD GENOA MPIO",
 };
 
 static void nbio_config(void)