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>
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",
};