include/device/device.h: Remove CHIP_NAME() macro

Macros can be confusing on their own; hiding commas make things worse.
This can sometimes be downright misleading. A "good" example would be
the code in soc/intel/xeon_sp/spr/chip.c:

CHIP_NAME("Intel SapphireRapids-SP").enable_dev = chip_enable_dev,

This appears as CHIP_NAME() being some struct when in fact these are
defining 2 separate members of the same struct.

It was decided to remove this macro altogether, as it does not do
anything special and incurs a maintenance burden.

Change-Id: Iaed6dfb144bddcf5c43634b0c955c19afce388f0
Signed-off-by: Nicholas Sudsgaard <devel+coreboot@nsudsgaard.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80239
Reviewed-by: Yidi Lin <yidilin@google.com>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Jakub Czapiga <czapiga@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>

48 files changed, 50 insertions, 49 deletions

diff --git a/src/soc/amd/cezanne/chip.c b/src/soc/amd/cezanne/chip.c
index 4be0a829e4..ffbd94a404 100644
--- a/src/soc/amd/cezanne/chip.c
+++ b/src/soc/amd/cezanne/chip.c
@@ -50,7 +50,7 @@ static void soc_final(void *chip_info)
 }
 
 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 83d2bc9fa6..d397800ec1 100644
--- a/src/soc/amd/genoa_poc/chip.c
+++ b/src/soc/amd/genoa_poc/chip.c
@@ -21,7 +21,7 @@ static void soc_final(void *chip_info)
 }
 
 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 0f49f6a01c..13933c7df6 100644
--- a/src/soc/amd/glinda/chip.c
+++ b/src/soc/amd/glinda/chip.c
@@ -52,7 +52,7 @@ static void soc_final(void *chip_info)
 }
 
 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 f724e20409..0bb963747b 100644
--- a/src/soc/amd/mendocino/chip.c
+++ b/src/soc/amd/mendocino/chip.c
@@ -50,7 +50,7 @@ static void soc_final(void *chip_info)
 }
 
 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 173b2208df..72652bac60 100644
--- a/src/soc/amd/phoenix/chip.c
+++ b/src/soc/amd/phoenix/chip.c
@@ -52,7 +52,7 @@ static void soc_final(void *chip_info)
 }
 
 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 4f3058252c..d896a83372 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -50,7 +50,7 @@ static void soc_final(void *chip_info)
 }
 
 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 09cede3ddb..05beaff699 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -100,7 +100,7 @@ static void soc_final(void *chip_info)
 }
 
 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 ed1441ba45..5e606d3d9e 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -394,6 +394,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 4ee1cdfac7..af59e2b9fe 100644
--- a/src/soc/cavium/common/pci/uart.c
+++ b/src/soc/cavium/common/pci/uart.c
@@ -26,5 +26,5 @@ static const struct pci_driver soc_cavium_uart __pci_driver = {
 };
 
 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 063915798d..45fb39f931 100644
--- a/src/soc/intel/alderlake/chip.c
+++ b/src/soc/intel/alderlake/chip.c
@@ -286,7 +286,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 07c2637ecd..469b9be8d1 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -759,7 +759,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 }
 
 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 592e17879a..fdfd1299e6 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -43,7 +43,7 @@ static void soc_init(void *chip_info)
 }
 
 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 d3c41f8894..407b6ea018 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -294,7 +294,7 @@ static void soc_init(void *chip_info)
 }
 
 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 652527520f..3d2574ba6d 100644
--- a/src/soc/intel/broadwell/northbridge.c
+++ b/src/soc/intel/broadwell/northbridge.c
@@ -419,6 +419,6 @@ static void broadwell_init_pre_device(void *chip_info)
 }
 
 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 98fbc46e4e..ddb51ccf12 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -196,7 +196,7 @@ static void broadwell_pch_enable_dev(struct device *dev)
 }
 
 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 0da6e40c9c..bda66bd1dd 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -206,7 +206,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 abd7e46671..39c82b11f2 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 @@ static void pcie_rtd3_acpi_enable(struct device *dev)
 }
 
 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 533fbee832..c03f5a9d36 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -433,7 +433,7 @@ static void uart_enable(struct device *dev)
 }
 
 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 0139647949..f2414ccb12 100644
--- a/src/soc/intel/common/block/usb4/pcie.c
+++ b/src/soc/intel/common/block/usb4/pcie.c
@@ -81,6 +81,6 @@ static void usb4_pcie_acpi_enable(struct device *dev)
 }
 
 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 1a4341e1d6..10164600e7 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -187,7 +187,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 }
 
 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 194591d65a..f9e4e0eeee 100644
--- a/src/soc/intel/elkhartlake/chip.c
+++ b/src/soc/intel/elkhartlake/chip.c
@@ -159,7 +159,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 c049163fec..7b185c3e64 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -170,7 +170,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 be957cc51f..03adfdb738 100644
--- a/src/soc/intel/meteorlake/chip.c
+++ b/src/soc/intel/meteorlake/chip.c
@@ -276,7 +276,7 @@ static void soc_init_final_device(void *chip_info)
 }
 
 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 8df1ad3543..f471edb960 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -212,7 +212,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 dd24679273..c94e727936 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -222,7 +222,7 @@ static void soc_enable(struct device *dev)
 }
 
 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 39a7ebaae2..1e84dd5a5c 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -186,7 +186,7 @@ static void chip_init(void *data)
 }
 
 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 b468842e92..68737ed5b1 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -89,7 +89,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 }
 
 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 3b3c65e4a0..abab0d2413 100644
--- a/src/soc/intel/xeon_sp/spr/chip.c
+++ b/src/soc/intel/xeon_sp/spr/chip.c
@@ -159,7 +159,8 @@ static void chip_init(void *data)
 }
 
 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 ebdf4e5420..f6ee122bf9 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -45,6 +45,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 32ec4e4453..38323f769b 100644
--- a/src/soc/mediatek/mt8183/soc.c
+++ b/src/soc/mediatek/mt8183/soc.c
@@ -33,6 +33,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 a55e2ee2cb..ada794f1e0 100644
--- a/src/soc/mediatek/mt8186/soc.c
+++ b/src/soc/mediatek/mt8186/soc.c
@@ -50,6 +50,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 d0a29c578c..35071d50f1 100644
--- a/src/soc/mediatek/mt8188/soc.c
+++ b/src/soc/mediatek/mt8188/soc.c
@@ -65,6 +65,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 74d2579a36..a84cf4a6b5 100644
--- a/src/soc/mediatek/mt8192/soc.c
+++ b/src/soc/mediatek/mt8192/soc.c
@@ -47,6 +47,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 5425695baf..20a9811d15 100644
--- a/src/soc/mediatek/mt8195/soc.c
+++ b/src/soc/mediatek/mt8195/soc.c
@@ -70,6 +70,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 64fb8681ce..1de8ab30b3 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -47,6 +47,6 @@ static void enable_tegra124_dev(struct device *dev)
 }
 
 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 b037bdfcb3..e207da6020 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -80,7 +80,7 @@ static void tegra210_init(void *chip_info)
 }
 
 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 f482cff30b..ff074b77d8 100644
--- a/src/soc/qualcomm/ipq40xx/soc.c
+++ b/src/soc/qualcomm/ipq40xx/soc.c
@@ -49,6 +49,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 ad0510f021..b0c05c964d 100644
--- a/src/soc/qualcomm/ipq806x/soc.c
+++ b/src/soc/qualcomm/ipq806x/soc.c
@@ -39,6 +39,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 f1a2def791..18bf698d5a 100644
--- a/src/soc/qualcomm/qcs405/soc.c
+++ b/src/soc/qualcomm/qcs405/soc.c
@@ -27,6 +27,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 cef7e8f8c5..f81eeea273 100644
--- a/src/soc/qualcomm/sc7180/soc.c
+++ b/src/soc/qualcomm/sc7180/soc.c
@@ -36,6 +36,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 783c557e4b..8dd53cc14f 100644
--- a/src/soc/qualcomm/sc7280/soc.c
+++ b/src/soc/qualcomm/sc7280/soc.c
@@ -53,6 +53,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 20f5cece92..8704d16043 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -33,6 +33,6 @@ static void enable_rk3288_dev(struct device *dev)
 }
 
 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 03c39a9daa..0937e8f6f9 100644
--- a/src/soc/rockchip/rk3399/soc.c
+++ b/src/soc/rockchip/rk3399/soc.c
@@ -46,6 +46,6 @@ static void enable_soc_dev(struct device *dev)
 }
 
 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 06c9423821..bbf04d91b4 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -128,7 +128,7 @@ static void enable_exynos5250_dev(struct device *dev)
 }
 
 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 7869ab8f1a..b55cb34b17 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -156,6 +156,6 @@ static void enable_exynos5420_dev(struct device *dev)
 }
 
 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 6eab45c61c..e33b4a3b0f 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 410b2d772f..b409ab0f11 100644
--- a/src/soc/ti/am335x/soc.c
+++ b/src/soc/ti/am335x/soc.c
@@ -10,6 +10,6 @@ static void soc_enable(struct device *dev)
 }
 
 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 187e96d274..2e0f528128 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",
 };