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>

55 files changed, 55 insertions, 55 deletions

diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index 4510c21ea4..51c646458d 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -103,6 +103,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 c6903402a0..1758accbff 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -324,6 +324,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 17fa379df4..885d3f7586 100644
--- a/src/superio/fintek/f71808a/superio.c
+++ b/src/superio/fintek/f71808a/superio.c
@@ -51,6 +51,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 1f4424954f..628d4c952b 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -33,6 +33,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 c4e8dc9873..6f1735d7a2 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -50,6 +50,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 3cfd387df4..a4affee0d8 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -107,6 +107,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 5304f9edc6..4d4e8bc461 100644
--- a/src/superio/fintek/f81803a/superio.c
+++ b/src/superio/fintek/f81803a/superio.c
@@ -57,6 +57,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 9181bad987..70fefe50cb 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -48,6 +48,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 3803230d55..6bcf311045 100644
--- a/src/superio/fintek/f81866d/superio.c
+++ b/src/superio/fintek/f81866d/superio.c
@@ -73,6 +73,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 d135c0b573..97d8850a87 100644
--- a/src/superio/ite/it8528e/superio.c
+++ b/src/superio/ite/it8528e/superio.c
@@ -49,6 +49,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 c18c3ec357..78241b21db 100644
--- a/src/superio/ite/it8613e/superio.c
+++ b/src/superio/ite/it8613e/superio.c
@@ -63,6 +63,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 15e0071db8..7800a3453a 100644
--- a/src/superio/ite/it8623e/superio.c
+++ b/src/superio/ite/it8623e/superio.c
@@ -60,6 +60,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 17a1976421..03127b5fed 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -65,6 +65,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 1243e75fcf..fafe30d61d 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -71,6 +71,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 75d0be9c02..4491c10134 100644
--- a/src/superio/ite/it8720f/superio.c
+++ b/src/superio/ite/it8720f/superio.c
@@ -112,6 +112,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 f69e1b0a36..801e27b278 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -63,6 +63,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 67ef2181fd..5e4c2fddb8 100644
--- a/src/superio/ite/it8728f/superio.c
+++ b/src/superio/ite/it8728f/superio.c
@@ -60,6 +60,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 82f30fa6cd..177136818c 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -268,6 +268,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 d90ae5f3b7..618ea3feef 100644
--- a/src/superio/ite/it8783ef/superio.c
+++ b/src/superio/ite/it8783ef/superio.c
@@ -88,6 +88,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 85fc42ea60..1caa837755 100644
--- a/src/superio/ite/it8784e/superio.c
+++ b/src/superio/ite/it8784e/superio.c
@@ -82,6 +82,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 8d9ec1477e..f610fdf49e 100644
--- a/src/superio/ite/it8786e/superio.c
+++ b/src/superio/ite/it8786e/superio.c
@@ -98,6 +98,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 355aca49ab..c60e84547c 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -41,6 +41,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 88d4d36990..60e0994281 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -25,6 +25,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 e65afeab6e..551249d78f 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -35,6 +35,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 be99f7f031..ac01c4618f 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -46,6 +46,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 cfa22280fc..33533696a8 100644
--- a/src/superio/nuvoton/nct5104d/superio.c
+++ b/src/superio/nuvoton/nct5104d/superio.c
@@ -232,6 +232,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 ff37f5cefd..cef40a546e 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -95,6 +95,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 7e893eee54..34fa016ac8 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -104,6 +104,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 a2eea8c50f..c28092736f 100644
--- a/src/superio/nuvoton/nct6687d/superio.c
+++ b/src/superio/nuvoton/nct6687d/superio.c
@@ -87,6 +87,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 4197d54ad3..d98e303b96 100644
--- a/src/superio/nuvoton/nct6776/superio.c
+++ b/src/superio/nuvoton/nct6776/superio.c
@@ -67,6 +67,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 77058b0bc3..13604769ab 100644
--- a/src/superio/nuvoton/nct6779d/superio.c
+++ b/src/superio/nuvoton/nct6779d/superio.c
@@ -62,6 +62,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 3244e05fb2..91a39084a9 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -102,6 +102,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 615bae5433..a4759fb721 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -460,6 +460,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 45c2e93ca7..863ad2b985 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -40,6 +40,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 293fe0efb9..6b7125631f 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -45,6 +45,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 a62bba8623..ba197d8422 100644
--- a/src/superio/smsc/fdc37n972/superio.c
+++ b/src/superio/smsc/fdc37n972/superio.c
@@ -46,6 +46,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 862a77bd13..74f2326bd3 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -14,7 +14,7 @@ static void enable_dev(struct device *dev);
 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 cb297a5b14..157275ea7e 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -58,6 +58,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 e1e4883ba6..6f57133c82 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -14,7 +14,7 @@ static void enable_dev(struct device *dev);
 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 dcaf6e760b..c59ce2d7ca 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -25,7 +25,7 @@ static void pnp_enter_conf_state(struct device *dev);
 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 37123509a9..edcc2717c9 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -24,7 +24,7 @@ void lpc47n227_pnp_set_irq(struct device *dev, u8 irq);
 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 6c8597c0a8..39e100ece9 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -47,6 +47,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 1ce1fd61aa..7b8e5a063e 100644
--- a/src/superio/smsc/sch5545/superio.c
+++ b/src/superio/smsc/sch5545/superio.c
@@ -303,6 +303,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 2245001af2..1cdd8697ce 100644
--- a/src/superio/smsc/sch555x/ramstage.c
+++ b/src/superio/smsc/sch555x/ramstage.c
@@ -136,6 +136,6 @@ static void sch555x_enable_dev(struct device *dev)
 }
 
 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 3dcaae8dde..8b1704f83c 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -33,6 +33,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 ca5a0c69f1..fa79a57a9b 100644
--- a/src/superio/smsc/sio10n268/superio.c
+++ b/src/superio/smsc/sio10n268/superio.c
@@ -43,6 +43,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 a182d90d30..3ba8216961 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -281,6 +281,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 2641cb324b..491b5c9c6d 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -68,6 +68,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 1e36048146..03dce827cb 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -129,6 +129,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 de2a0c6491..f0c5b2870d 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -129,6 +129,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 4276da6f5b..156239f1a3 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -50,6 +50,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 4b54bac98d..e276fc5e08 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -101,6 +101,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 a5abe61818..4cddf20187 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -103,6 +103,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 4187b52a42..28bfc8c4cd 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -50,6 +50,6 @@ static void enable_dev(struct device *dev)
 }
 
 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 a692eeb25d..635d02512b 100644
--- a/src/superio/winbond/wpcd376i/superio.c
+++ b/src/superio/winbond/wpcd376i/superio.c
@@ -61,6 +61,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_winbond_wpcd376i_ops = {
-	CHIP_NAME("Winbond WPCD376I Super I/O")
+	.name = "Winbond WPCD376I Super I/O",
 	.enable_dev = enable_dev,
 };