[coreboot] Patch set updated for coreboot: d2bf2e2 Move name field from chip_ops to device

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1950

-gerrit

commit d2bf2e2c652e54cc8890ee4be22479398d813fc1
Author: Kyösti Mälkki 
Date:   Thu Aug 23 06:31:52 2012 +0300

Move name field from chip_ops to device

The name string defaults to the chip name set with DEVICE_NAME()
    macro (or unknown if no name is given). Once the hardware is
    actually detected, the name should be replace with more accurate
    representation with chip type and revision.

Use DEVICE_NAME() to define the default string for all devices
    in the same chip/component directory.

Change-Id: If67098e621c3190d68d584802175273d233488af
    Signed-off-by: Kyösti Mälkki 
---
 src/cpu/amd/agesa/family10/chip_name.c               | 2 +-
 src/cpu/amd/agesa/family12/chip_name.c               | 2 +-
 src/cpu/amd/agesa/family14/chip_name.c               | 2 +-
 src/cpu/amd/agesa/family15/chip_name.c               | 2 +-
 src/cpu/amd/agesa/family15tn/chip_name.c             | 2 +-
 src/cpu/amd/sc520/sc520.c                            | 2 +-
 src/cpu/amd/socket_754/socket_754.c                  | 2 +-
 src/cpu/amd/socket_939/socket_939.c                  | 2 +-
 src/cpu/amd/socket_940/socket_940.c                  | 2 +-
 src/cpu/amd/socket_AM2/socket_AM2.c                  | 2 +-
 src/cpu/amd/socket_AM2r2/socket_AM2r2.c              | 2 +-
 src/cpu/amd/socket_AM3/socket_AM3.c                  | 2 +-
 src/cpu/amd/socket_ASB2/socket_ASB2.c                | 2 +-
 src/cpu/amd/socket_C32/socket_C32.c                  | 2 +-
 src/cpu/amd/socket_F/socket_F.c                      | 2 +-
 src/cpu/amd/socket_F_1207/socket_F_1207.c            | 2 +-
 src/cpu/amd/socket_S1G1/socket_S1G1.c                | 2 +-
 src/cpu/intel/ep80579/ep80579.c                      | 2 +-
 src/cpu/intel/model_1067x/model_1067x_init.c         | 2 +-
 src/cpu/intel/model_206ax/acpi.c                     | 2 +-
 src/cpu/intel/slot_1/slot_1.c                        | 2 +-
 src/cpu/intel/slot_2/slot_2.c                        | 2 +-
 src/cpu/intel/socket_441/socket_441.c                | 2 +-
 src/cpu/intel/socket_BGA956/socket_BGA956.c          | 2 +-
 src/cpu/intel/socket_FC_PGA370/socket_FC_PGA370.c    | 2 +-
 src/cpu/intel/socket_LGA771/socket_LGA771.c          | 2 +-
 src/cpu/intel/socket_LGA775/socket_LGA775.c          | 2 +-
 src/cpu/intel/socket_PGA370/socket_PGA370.c          | 2 +-
 src/cpu/intel/socket_mFCBGA479/socket_mFCBGA479.c    | 2 +-
 src/cpu/intel/socket_mFCPGA478/socket_mFCPGA478.c    | 2 +-
 src/cpu/intel/socket_mPGA478/socket_mPGA478.c        | 2 +-
 src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c      | 2 +-
 src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c | 2 +-
 src/cpu/intel/socket_mPGA604/socket_mPGA604.c        | 2 +-
 src/cpu/intel/socket_rPGA989/socket_rPGA989.c        | 2 +-
 src/device/device_util.c                             | 2 --
 src/drivers/generic/debug/debug_dev.c                | 2 +-
 src/drivers/generic/ioapic/ioapic.c                  | 2 +-
 src/drivers/i2c/adm1026/adm1026.c                    | 2 +-
 src/drivers/i2c/adm1027/adm1027.c                    | 2 +-
 src/drivers/i2c/adt7463/adt7463.c                    | 2 +-
 src/drivers/i2c/i2cmux/i2cmux.c                      | 2 +-
 src/drivers/i2c/i2cmux2/i2cmux2.c                    | 2 +-
 src/drivers/i2c/lm63/lm63.c                          | 2 +-
 src/drivers/i2c/w83793/w83793.c                      | 2 +-
 src/drivers/i2c/w83795/w83795.c                      | 2 +-
 src/drivers/ics/954309/ics954309.c                   | 2 +-
 src/ec/acpi/ec.c                                     | 2 +-
 src/ec/lenovo/h8/h8.c                                | 2 +-
 src/ec/lenovo/pmh7/pmh7.c                            | 2 +-
 src/ec/smsc/mec1308/ec.c                             | 2 +-
 src/include/device/device.h                          | 3 ---
 src/mainboard/emulation/qemu-x86/northbridge.c       | 1 -
 src/mainboard/iei/pm-lx2-800-r10/mainboard.c         | 1 -
 src/northbridge/amd/agesa/family10/northbridge.c     | 4 ++--
 src/northbridge/amd/agesa/family12/northbridge.c     | 4 ++--
 src/northbridge/amd/agesa/family14/northbridge.c     | 4 ++--
 src/northbridge/amd/agesa/family15/northbridge.c     | 4 ++--
 src/northbridge/amd/agesa/family15tn/northbridge.c   | 4 ++--
 src/northbridge/amd/amdfam10/northbridge.c           | 4 ++--
 src/northbridge/amd/amdk8/northbridge.c              | 4 ++--
 src/northbridge/amd/cimx/rd890/late.c                | 2 +-
 src/northbridge/amd/gx1/northbridge.c                | 2 +-
 src/northbridge/amd/gx2/northbridge.c                | 2 +-
 src/northbridge/amd/lx/northbridge.c                 | 2 +-
 src/northbridge/intel/e7501/northbridge.c            | 2 +-
 src/northbridge/intel/e7505/northbridge.c            | 2 +-
 src/northbridge/intel/e7520/northbridge.c            | 2 +-
 src/northbridge/intel/e7525/northbridge.c            | 2 +-
 src/northbridge/intel/gm45/northbridge.c             | 2 +-
 src/northbridge/intel/i3100/northbridge.c            | 2 +-
 src/northbridge/intel/i440bx/northbridge.c           | 2 +-
 src/northbridge/intel/i440lx/northbridge.c           | 2 +-
 src/northbridge/intel/i5000/northbridge.c            | 2 +-
 src/northbridge/intel/i82810/northbridge.c           | 2 +-
 src/northbridge/intel/i82830/northbridge.c           | 2 +-
 src/northbridge/intel/i855/northbridge.c             | 2 +-
 src/northbridge/intel/i945/northbridge.c             | 2 +-
 src/northbridge/intel/sandybridge/northbridge.c      | 2 +-
 src/northbridge/intel/sch/northbridge.c              | 2 +-
 src/northbridge/rdc/r8610/northbridge.c              | 2 +-
 src/northbridge/via/cn400/northbridge.c              | 2 +-
 src/northbridge/via/cn700/northbridge.c              | 2 +-
 src/northbridge/via/cx700/northbridge.c              | 2 +-
 src/northbridge/via/vt8601/northbridge.c             | 2 +-
 src/northbridge/via/vt8623/northbridge.c             | 2 +-
 src/northbridge/via/vx800/northbridge.c              | 2 +-
 src/southbridge/amd/agesa/hudson/hudson.c            | 2 +-
 src/southbridge/amd/amd8111/amd8111.c                | 2 +-
 src/southbridge/amd/cimx/sb700/late.c                | 2 +-
 src/southbridge/amd/cimx/sb800/late.c                | 2 +-
 src/southbridge/amd/cimx/sb900/late.c                | 2 +-
 src/southbridge/amd/cs5530/cs5530.c                  | 2 +-
 src/southbridge/amd/cs5535/cs5535.c                  | 2 +-
 src/southbridge/amd/cs5536/cs5536.c                  | 2 +-
 src/southbridge/amd/rs690/rs690.c                    | 2 +-
 src/southbridge/amd/rs780/rs780.c                    | 2 +-
 src/southbridge/amd/sb600/sb600.c                    | 2 +-
 src/southbridge/amd/sb700/sb700.c                    | 4 ++--
 src/southbridge/amd/sb800/sb800.c                    | 2 +-
 src/southbridge/amd/sr5650/sr5650.c                  | 2 +-
 src/southbridge/broadcom/bcm5785/bcm5785.c           | 2 +-
 src/southbridge/intel/bd82x6x/pch.c                  | 2 +-
 src/southbridge/intel/esb6300/esb6300.c              | 2 +-
 src/southbridge/intel/i3100/i3100.c                  | 2 +-
 src/southbridge/intel/i82371eb/i82371eb.c            | 2 +-
 src/southbridge/intel/i82801ax/i82801ax.c            | 2 +-
 src/southbridge/intel/i82801bx/i82801bx.c            | 2 +-
 src/southbridge/intel/i82801cx/i82801cx.c            | 2 +-
 src/southbridge/intel/i82801dx/i82801dx.c            | 2 +-
 src/southbridge/intel/i82801ex/i82801ex.c            | 2 +-
 src/southbridge/intel/i82801gx/i82801gx.c            | 2 +-
 src/southbridge/intel/i82801ix/i82801ix.c            | 2 +-
 src/southbridge/intel/pxhd/bridge.c                  | 2 +-
 src/southbridge/intel/sch/south.c                    | 2 +-
 src/southbridge/nvidia/ck804/ck804.c                 | 2 +-
 src/southbridge/nvidia/mcp55/mcp55.c                 | 2 +-
 src/southbridge/ricoh/rl5c476/rl5c476.c              | 2 +-
 src/southbridge/sis/sis966/sis966.c                  | 2 +-
 src/southbridge/ti/pci1x2x/pci1x2x.c                 | 2 +-
 src/southbridge/ti/pci7420/cardbus.c                 | 2 +-
 src/southbridge/ti/pci7420/firewire.c                | 2 +-
 src/southbridge/ti/pcixx12/pcixx12.c                 | 2 +-
 src/southbridge/via/vt8231/vt8231.c                  | 2 +-
 src/southbridge/via/vt8235/vt8235.c                  | 2 +-
 src/southbridge/via/vt8237r/vt8237r.c                | 2 +-
 src/superio/fintek/f71805f/superio.c                 | 2 +-
 src/superio/fintek/f71859/superio.c                  | 2 +-
 src/superio/fintek/f71863fg/superio.c                | 2 +-
 src/superio/fintek/f71872/superio.c                  | 2 +-
 src/superio/fintek/f71889/superio.c                  | 2 +-
 src/superio/fintek/f81865f/superio.c                 | 2 +-
 src/superio/intel/i3100/superio.c                    | 2 +-
 src/superio/ite/it8661f/superio.c                    | 2 +-
 src/superio/ite/it8671f/superio.c                    | 2 +-
 src/superio/ite/it8673f/superio.c                    | 2 +-
 src/superio/ite/it8705f/superio.c                    | 2 +-
 src/superio/ite/it8712f/superio.c                    | 2 +-
 src/superio/ite/it8716f/superio.c                    | 2 +-
 src/superio/ite/it8718f/superio.c                    | 2 +-
 src/superio/ite/it8721f/superio.c                    | 2 +-
 src/superio/ite/it8772f/superio.c                    | 2 +-
 src/superio/nsc/pc8374/superio.c                     | 2 +-
 src/superio/nsc/pc87309/superio.c                    | 2 +-
 src/superio/nsc/pc87351/superio.c                    | 2 +-
 src/superio/nsc/pc87360/superio.c                    | 2 +-
 src/superio/nsc/pc87366/superio.c                    | 2 +-
 src/superio/nsc/pc87382/superio.c                    | 2 +-
 src/superio/nsc/pc87384/superio.c                    | 2 +-
 src/superio/nsc/pc87392/superio.c                    | 2 +-
 src/superio/nsc/pc87417/superio.c                    | 2 +-
 src/superio/nsc/pc87427/superio.c                    | 2 +-
 src/superio/nsc/pc97307/superio.c                    | 2 +-
 src/superio/nsc/pc97317/superio.c                    | 2 +-
 src/superio/nuvoton/wpcm450/superio.c                | 2 +-
 src/superio/renesas/m3885x/superio.c                 | 2 +-
 src/superio/smsc/fdc37m60x/superio.c                 | 2 +-
 src/superio/smsc/fdc37n972/fdc37n972.c               | 2 +-
 src/superio/smsc/kbc1100/superio.c                   | 2 +-
 src/superio/smsc/lpc47b272/superio.c                 | 2 +-
 src/superio/smsc/lpc47b397/superio.c                 | 2 +-
 src/superio/smsc/lpc47m10x/superio.c                 | 2 +-
 src/superio/smsc/lpc47m15x/superio.c                 | 2 +-
 src/superio/smsc/lpc47n217/superio.c                 | 2 +-
 src/superio/smsc/lpc47n227/superio.c                 | 2 +-
 src/superio/smsc/mec1308/superio.c                   | 2 +-
 src/superio/smsc/sch4037/superio.c                   | 2 +-
 src/superio/smsc/sio1036/superio.c                   | 2 +-
 src/superio/smsc/sio10n268/sio10n268.c               | 2 +-
 src/superio/smsc/smscsuperio/superio.c               | 2 +-
 src/superio/via/vt1211/vt1211.c                      | 2 +-
 src/superio/winbond/w83627dhg/superio.c              | 2 +-
 src/superio/winbond/w83627ehg/superio.c              | 2 +-
 src/superio/winbond/w83627hf/superio.c               | 2 +-
 src/superio/winbond/w83627thg/superio.c              | 2 +-
 src/superio/winbond/w83627uhg/superio.c              | 2 +-
 src/superio/winbond/w83697hf/superio.c               | 2 +-
 src/superio/winbond/w83977f/superio.c                | 2 +-
 src/superio/winbond/w83977tf/superio.c               | 2 +-
 util/sconfig/main.c                                  | 3 +++
 180 files changed, 186 insertions(+), 190 deletions(-)

diff --git a/src/cpu/amd/agesa/family10/chip_name.c b/src/cpu/amd/agesa/family10/chip_name.c
index 656b4a2..56bce99 100644
--- a/src/cpu/amd/agesa/family10/chip_name.c
+++ b/src/cpu/amd/agesa/family10/chip_name.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("AMD CPU Family 10h");
 struct chip_operations cpu_amd_agesa_family10_ops = {
-	CHIP_NAME("AMD CPU Family 10h")
 };
diff --git a/src/cpu/amd/agesa/family12/chip_name.c b/src/cpu/amd/agesa/family12/chip_name.c
index 6574615..7d9c200 100644
--- a/src/cpu/amd/agesa/family12/chip_name.c
+++ b/src/cpu/amd/agesa/family12/chip_name.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("AMD CPU Family 12h");
 struct chip_operations cpu_amd_agesa_family12_ops = {
-	CHIP_NAME("AMD CPU Family 12h")
 };
diff --git a/src/cpu/amd/agesa/family14/chip_name.c b/src/cpu/amd/agesa/family14/chip_name.c
index 474edc7..0f4c6b5 100644
--- a/src/cpu/amd/agesa/family14/chip_name.c
+++ b/src/cpu/amd/agesa/family14/chip_name.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("AMD CPU Family 14h");
 struct chip_operations cpu_amd_agesa_family14_ops = {
-	CHIP_NAME("AMD CPU Family 14h")
 };
diff --git a/src/cpu/amd/agesa/family15/chip_name.c b/src/cpu/amd/agesa/family15/chip_name.c
index 3ca6e9f..b148c1d 100644
--- a/src/cpu/amd/agesa/family15/chip_name.c
+++ b/src/cpu/amd/agesa/family15/chip_name.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("AMD CPU Family 15h");
 struct chip_operations cpu_amd_agesa_family15_ops = {
-	CHIP_NAME("AMD CPU Family 15h")
 };
diff --git a/src/cpu/amd/agesa/family15tn/chip_name.c b/src/cpu/amd/agesa/family15tn/chip_name.c
index d923260..55a7cb3 100644
--- a/src/cpu/amd/agesa/family15tn/chip_name.c
+++ b/src/cpu/amd/agesa/family15tn/chip_name.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("AMD CPU Family 15h");
 struct chip_operations cpu_amd_agesa_family15tn_ops = {
-	CHIP_NAME("AMD CPU Family 15h")
 };
diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index 6954f44..b6e6048 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -201,7 +201,7 @@ static void enable_dev(struct device *dev)
 }

+DEVICE_NAME("AMD Elan SC520 CPU");
 struct chip_operations cpu_amd_sc520_ops = {
-	CHIP_NAME("AMD Elan SC520 CPU")
    .enable_dev = enable_dev,
 };
diff --git a/src/cpu/amd/socket_754/socket_754.c b/src/cpu/amd/socket_754/socket_754.c
index f75c1ec..9485842 100644
--- a/src/cpu/amd/socket_754/socket_754.c
+++ b/src/cpu/amd/socket_754/socket_754.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket 754 CPU");
 struct chip_operations cpu_amd_socket_754_ops = {
-	CHIP_NAME("Socket 754 CPU")
 };
diff --git a/src/cpu/amd/socket_939/socket_939.c b/src/cpu/amd/socket_939/socket_939.c
index a44a8a6..3d54d77 100644
--- a/src/cpu/amd/socket_939/socket_939.c
+++ b/src/cpu/amd/socket_939/socket_939.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket 939 CPU");
 struct chip_operations cpu_amd_socket_939_ops = {
-	CHIP_NAME("Socket 939 CPU")
 };
diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c
index 872f040..c3bbfc7 100644
--- a/src/cpu/amd/socket_940/socket_940.c
+++ b/src/cpu/amd/socket_940/socket_940.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket 940 CPU");
 struct chip_operations cpu_amd_socket_940_ops = {
-	CHIP_NAME("Socket 940 CPU")
 };
diff --git a/src/cpu/amd/socket_AM2/socket_AM2.c b/src/cpu/amd/socket_AM2/socket_AM2.c
index 60378ab..00ab6e4 100644
--- a/src/cpu/amd/socket_AM2/socket_AM2.c
+++ b/src/cpu/amd/socket_AM2/socket_AM2.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket AM2 CPU");
 struct chip_operations cpu_amd_socket_AM2_ops = {
-	CHIP_NAME("Socket AM2 CPU")
 };
diff --git a/src/cpu/amd/socket_AM2r2/socket_AM2r2.c b/src/cpu/amd/socket_AM2r2/socket_AM2r2.c
index d618563..abd4bad 100644
--- a/src/cpu/amd/socket_AM2r2/socket_AM2r2.c
+++ b/src/cpu/amd/socket_AM2r2/socket_AM2r2.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("socket AM2r2");
 struct chip_operations cpu_amd_socket_AM2r2_ops = {
-	CHIP_NAME("socket AM2r2")
 };
diff --git a/src/cpu/amd/socket_AM3/socket_AM3.c b/src/cpu/amd/socket_AM3/socket_AM3.c
index 91871e8..ec183cd 100644
--- a/src/cpu/amd/socket_AM3/socket_AM3.c
+++ b/src/cpu/amd/socket_AM3/socket_AM3.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("socket AM3");
 struct chip_operations cpu_amd_socket_AM3_ops = {
-	CHIP_NAME("socket AM3")
 };
diff --git a/src/cpu/amd/socket_ASB2/socket_ASB2.c b/src/cpu/amd/socket_ASB2/socket_ASB2.c
index 3c38a8c..1fd5ba1 100644
--- a/src/cpu/amd/socket_ASB2/socket_ASB2.c
+++ b/src/cpu/amd/socket_ASB2/socket_ASB2.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("socket ASB2");
 struct chip_operations cpu_amd_socket_ASB2_ops = {
-	CHIP_NAME("socket ASB2")
 };
diff --git a/src/cpu/amd/socket_C32/socket_C32.c b/src/cpu/amd/socket_C32/socket_C32.c
index 4f90458..5078572 100644
--- a/src/cpu/amd/socket_C32/socket_C32.c
+++ b/src/cpu/amd/socket_C32/socket_C32.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("socket C32");
 struct chip_operations cpu_amd_socket_C32_ops = {
-	CHIP_NAME("socket C32")
 };
diff --git a/src/cpu/amd/socket_F/socket_F.c b/src/cpu/amd/socket_F/socket_F.c
index 80c3e35..9ba4c5f 100644
--- a/src/cpu/amd/socket_F/socket_F.c
+++ b/src/cpu/amd/socket_F/socket_F.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket F CPU");
 struct chip_operations cpu_amd_socket_F_ops = {
-	CHIP_NAME("Socket F CPU")
 };
diff --git a/src/cpu/amd/socket_F_1207/socket_F_1207.c b/src/cpu/amd/socket_F_1207/socket_F_1207.c
index e84f435..c0694dc 100644
--- a/src/cpu/amd/socket_F_1207/socket_F_1207.c
+++ b/src/cpu/amd/socket_F_1207/socket_F_1207.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("socket F_1207");
 struct chip_operations cpu_amd_socket_F_1207_ops = {
-	CHIP_NAME("socket F_1207")
 };
diff --git a/src/cpu/amd/socket_S1G1/socket_S1G1.c b/src/cpu/amd/socket_S1G1/socket_S1G1.c
index 0b9702c..c2f3655 100644
--- a/src/cpu/amd/socket_S1G1/socket_S1G1.c
+++ b/src/cpu/amd/socket_S1G1/socket_S1G1.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket S1G1 CPU");
 struct chip_operations cpu_amd_socket_S1G1_ops = {
-	CHIP_NAME("Socket S1G1 CPU")
 };
diff --git a/src/cpu/intel/ep80579/ep80579.c b/src/cpu/intel/ep80579/ep80579.c
index 7d6e715..d8de30b 100644
--- a/src/cpu/intel/ep80579/ep80579.c
+++ b/src/cpu/intel/ep80579/ep80579.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("EP80579 CPU");
 struct chip_operations cpu_intel_ep80579_ops = {
-	CHIP_NAME("EP80579 CPU")
 };
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 2b7839b..1d69e96 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -409,6 +409,6 @@ static const struct cpu_driver driver __cpu_driver = {
    .id_table = cpu_table,
 };

+DEVICE_NAME("Intel Penryn CPU");
 struct chip_operations cpu_intel_model_1067x_ops = {
-	CHIP_NAME("Intel Penryn CPU")
 };
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 80ed4ba..d02d746 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -359,6 +359,6 @@ void generate_cpu_entries(void)
    }
 }

+DEVICE_NAME("Intel SandyBridge/IvyBridge CPU");
 struct chip_operations cpu_intel_model_206ax_ops = {
-	CHIP_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 df48248..ef7d572 100644
--- a/src/cpu/intel/slot_1/slot_1.c
+++ b/src/cpu/intel/slot_1/slot_1.c
@@ -20,6 +20,6 @@

#include <device/device.h>

+DEVICE_NAME("Slot 1 CPU");
 struct chip_operations cpu_intel_slot_1_ops = {
-	CHIP_NAME("Slot 1 CPU")
 };
diff --git a/src/cpu/intel/slot_2/slot_2.c b/src/cpu/intel/slot_2/slot_2.c
index 994b25a..ad20952 100644
--- a/src/cpu/intel/slot_2/slot_2.c
+++ b/src/cpu/intel/slot_2/slot_2.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Slot 2 CPU");
 struct chip_operations cpu_intel_slot_2_ops = {
-	CHIP_NAME("Slot 2 CPU")
 };
diff --git a/src/cpu/intel/socket_441/socket_441.c b/src/cpu/intel/socket_441/socket_441.c
index 319a402..784cbc3 100644
--- a/src/cpu/intel/socket_441/socket_441.c
+++ b/src/cpu/intel/socket_441/socket_441.c
@@ -19,6 +19,6 @@

#include <device/device.h>

+DEVICE_NAME("Socket 441 CPU");
 struct chip_operations cpu_intel_socket_441_ops = {
-	CHIP_NAME("Socket 441 CPU")
 };
diff --git a/src/cpu/intel/socket_BGA956/socket_BGA956.c b/src/cpu/intel/socket_BGA956/socket_BGA956.c
index def7cc9..bda558b 100644
--- a/src/cpu/intel/socket_BGA956/socket_BGA956.c
+++ b/src/cpu/intel/socket_BGA956/socket_BGA956.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket BGA956 CPU");
 struct chip_operations cpu_intel_socket_BGA956_ops = {
-	CHIP_NAME("Socket BGA956 CPU")
 };
diff --git a/src/cpu/intel/socket_FC_PGA370/socket_FC_PGA370.c b/src/cpu/intel/socket_FC_PGA370/socket_FC_PGA370.c
index 62186f2..91f71ee 100644
--- a/src/cpu/intel/socket_FC_PGA370/socket_FC_PGA370.c
+++ b/src/cpu/intel/socket_FC_PGA370/socket_FC_PGA370.c
@@ -20,6 +20,6 @@

#include <device/device.h>

+DEVICE_NAME("(FC)PGA370 CPU");
 struct chip_operations cpu_intel_socket_FC_PGA370_ops = {
-	CHIP_NAME("(FC)PGA370 CPU")
 };
diff --git a/src/cpu/intel/socket_LGA771/socket_LGA771.c b/src/cpu/intel/socket_LGA771/socket_LGA771.c
index 85570ba..abb9de1 100644
--- a/src/cpu/intel/socket_LGA771/socket_LGA771.c
+++ b/src/cpu/intel/socket_LGA771/socket_LGA771.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket LGA771 CPU");
 struct chip_operations cpu_intel_socket_LGA771_ops = {
-	CHIP_NAME("Socket LGA771 CPU")
 };
diff --git a/src/cpu/intel/socket_LGA775/socket_LGA775.c b/src/cpu/intel/socket_LGA775/socket_LGA775.c
index 7ec4e5e..7b1b480 100644
--- a/src/cpu/intel/socket_LGA775/socket_LGA775.c
+++ b/src/cpu/intel/socket_LGA775/socket_LGA775.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket LGA775 CPU");
 struct chip_operations cpu_intel_socket_LGA775_ops = {
-	CHIP_NAME("Socket LGA775 CPU")
 };
diff --git a/src/cpu/intel/socket_PGA370/socket_PGA370.c b/src/cpu/intel/socket_PGA370/socket_PGA370.c
index f7c1c2a..64d5775 100644
--- a/src/cpu/intel/socket_PGA370/socket_PGA370.c
+++ b/src/cpu/intel/socket_PGA370/socket_PGA370.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket PGA370 CPU");
 struct chip_operations cpu_intel_socket_PGA370_ops = {
-	CHIP_NAME("Socket PGA370 CPU")
 };
diff --git a/src/cpu/intel/socket_mFCBGA479/socket_mFCBGA479.c b/src/cpu/intel/socket_mFCBGA479/socket_mFCBGA479.c
index 02849b9..6ca3ebd 100644
--- a/src/cpu/intel/socket_mFCBGA479/socket_mFCBGA479.c
+++ b/src/cpu/intel/socket_mFCBGA479/socket_mFCBGA479.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Micro-FCBGA 479 CPU");
 struct chip_operations cpu_intel_socket_mFCBGA479_ops = {
-	CHIP_NAME("Micro-FCBGA 479 CPU")
 };
diff --git a/src/cpu/intel/socket_mFCPGA478/socket_mFCPGA478.c b/src/cpu/intel/socket_mFCPGA478/socket_mFCPGA478.c
index 5b001bd..8dfd909 100644
--- a/src/cpu/intel/socket_mFCPGA478/socket_mFCPGA478.c
+++ b/src/cpu/intel/socket_mFCPGA478/socket_mFCPGA478.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket mFCPGA478 CPU");
 struct chip_operations cpu_intel_socket_mFCPGA478_ops = {
-	CHIP_NAME("Socket mFCPGA478 CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA478/socket_mPGA478.c b/src/cpu/intel/socket_mPGA478/socket_mPGA478.c
index 4480bde..18d81e6 100644
--- a/src/cpu/intel/socket_mPGA478/socket_mPGA478.c
+++ b/src/cpu/intel/socket_mPGA478/socket_mPGA478.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket mPGA478 CPU");
 struct chip_operations cpu_intel_socket_mPGA478_ops = {
-	CHIP_NAME("Socket mPGA478 CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c b/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
index b151c47..85ee95e 100644
--- a/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
+++ b/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket mPGA479M CPU");
 struct chip_operations cpu_intel_socket_mPGA479M_ops = {
-	CHIP_NAME("Socket mPGA479M CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
index f5f8e5b..7f5496a 100644
--- a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
+++ b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket mPGA603 400Mhz CPU");
 struct chip_operations cpu_intel_socket_mPGA603_ops = {
-	CHIP_NAME("Socket mPGA603 400Mhz CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA604/socket_mPGA604.c b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
index 74bdc0d..9ec5430 100644
--- a/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
+++ b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
@@ -1,6 +1,6 @@
 #include <device/device.h>

+DEVICE_NAME("Socket mPGA604 CPU");
 struct chip_operations cpu_intel_socket_mPGA604_ops = {
-	CHIP_NAME("Socket mPGA604 CPU")
 };
diff --git a/src/cpu/intel/socket_rPGA989/socket_rPGA989.c b/src/cpu/intel/socket_rPGA989/socket_rPGA989.c
index 6e05b57..af6a941 100644
--- a/src/cpu/intel/socket_rPGA989/socket_rPGA989.c
+++ b/src/cpu/intel/socket_rPGA989/socket_rPGA989.c
@@ -1,5 +1,5 @@
 #include <device/device.h>

+DEVICE_NAME("Socket rPGA989 CPU");
 struct chip_operations cpu_intel_socket_rPGA989_ops = {
-	CHIP_NAME("Socket rPGA989 CPU")
 };
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 224c58e..d7e6057 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -232,8 +232,6 @@ const char *dev_name(device_t dev)
 {
    if (dev->name)
    	return dev->name;
-	else if (dev->chip_ops && dev->chip_ops->name)
-		return dev->chip_ops->name;
    else
    	return "unknown";
 }
diff --git a/src/drivers/generic/debug/debug_dev.c b/src/drivers/generic/debug/debug_dev.c
index b523ca7..6f2e565 100644
--- a/src/drivers/generic/debug/debug_dev.c
+++ b/src/drivers/generic/debug/debug_dev.c
@@ -283,7 +283,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &debug_operations;
 }

+DEVICE_NAME("Debug device");
 struct chip_operations drivers_generic_debug_ops = {
-	CHIP_NAME("Debug device")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c
index 9a93c78..fcfff80 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -129,7 +129,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &ioapic_operations;
 }

+DEVICE_NAME("IOAPIC");
 struct chip_operations drivers_generic_ioapic_ops = {
-	CHIP_NAME("IOAPIC")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/adm1026/adm1026.c b/src/drivers/i2c/adm1026/adm1026.c
index ab85eb5..1f9ad6a 100644
--- a/src/drivers/i2c/adm1026/adm1026.c
+++ b/src/drivers/i2c/adm1026/adm1026.c
@@ -60,7 +60,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &adm1026_operations;
 }

+DEVICE_NAME("adm1026");
 struct chip_operations drivers_i2c_adm1026_ops = {
-	CHIP_NAME("adm1026")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/adm1027/adm1027.c b/src/drivers/i2c/adm1027/adm1027.c
index e83f2c4..70617bd 100644
--- a/src/drivers/i2c/adm1027/adm1027.c
+++ b/src/drivers/i2c/adm1027/adm1027.c
@@ -66,7 +66,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &adm1027_operations;
 }

+DEVICE_NAME("adm1027");
 struct chip_operations drivers_i2c_adm1027_ops = {
-	CHIP_NAME("adm1027")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c
index a791fb4..65dc6fa 100644
--- a/src/drivers/i2c/adt7463/adt7463.c
+++ b/src/drivers/i2c/adt7463/adt7463.c
@@ -101,7 +101,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &adt7463_operations;
 }

+DEVICE_NAME("adt7463");
 struct chip_operations drivers_i2c_adt7463_ops = {
-	CHIP_NAME("adt7463")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/i2cmux/i2cmux.c b/src/drivers/i2c/i2cmux/i2cmux.c
index b318508..ffd60c5 100644
--- a/src/drivers/i2c/i2cmux/i2cmux.c
+++ b/src/drivers/i2c/i2cmux/i2cmux.c
@@ -35,7 +35,7 @@ static void enable_dev(struct device *dev)
    	dev->ops = &i2cmux_operations;
 }

+DEVICE_NAME("i2cmux");
 struct chip_operations drivers_i2c_i2cmux_ops = {
-	CHIP_NAME("i2cmux")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/i2cmux2/i2cmux2.c b/src/drivers/i2c/i2cmux2/i2cmux2.c
index a7d40e2..388b54e 100644
--- a/src/drivers/i2c/i2cmux2/i2cmux2.c
+++ b/src/drivers/i2c/i2cmux2/i2cmux2.c
@@ -34,7 +34,7 @@ static void enable_dev(struct device *dev)
    	dev->ops = &i2cmux2_operations;
 }

+DEVICE_NAME("i2cmux2");
 struct chip_operations drivers_i2c_i2cmux2_ops = {
-	CHIP_NAME("i2cmux2")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/lm63/lm63.c b/src/drivers/i2c/lm63/lm63.c
index 47a5489..2b0220d 100644
--- a/src/drivers/i2c/lm63/lm63.c
+++ b/src/drivers/i2c/lm63/lm63.c
@@ -37,7 +37,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &lm63_operations;
 }

+DEVICE_NAME("National Semiconductor LM63");
 struct chip_operations drivers_i2c_lm63_ops = {
-	CHIP_NAME("National Semiconductor LM63")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/w83793/w83793.c b/src/drivers/i2c/w83793/w83793.c
index c2ed53d..9089d59 100644
--- a/src/drivers/i2c/w83793/w83793.c
+++ b/src/drivers/i2c/w83793/w83793.c
@@ -236,7 +236,7 @@ static void enable_dev(device_t dev)
    dev->ops = &w83793_operations;
 }

+DEVICE_NAME("Nuvoton W83793 Hardware Monitor");
 struct chip_operations drivers_i2c_w83793_ops = {
-	CHIP_NAME("Nuvoton W83793 Hardware Monitor")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/i2c/w83795/w83795.c b/src/drivers/i2c/w83795/w83795.c
index 392471a..1d3fb3a 100644
--- a/src/drivers/i2c/w83795/w83795.c
+++ b/src/drivers/i2c/w83795/w83795.c
@@ -255,7 +255,7 @@ static void enable_dev(device_t dev)
    dev->ops = &w83795_operations;
 }

+DEVICE_NAME("Nuvoton W83795G/ADG Hardware Monitor");
 struct chip_operations drivers_i2c_w83795_ops = {
-	CHIP_NAME("Nuvoton W83795G/ADG Hardware Monitor")
    .enable_dev = enable_dev,
 };
diff --git a/src/drivers/ics/954309/ics954309.c b/src/drivers/ics/954309/ics954309.c
index ef62879..ab80910 100644
--- a/src/drivers/ics/954309/ics954309.c
+++ b/src/drivers/ics/954309/ics954309.c
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
    dev->ops = &ics954309_operations;
 }

+DEVICE_NAME("ICS 954309 Clock generator");
 struct chip_operations drivers_ics_954309_ops = {
-	CHIP_NAME("ICS 954309 Clock generator")
    .enable_dev = enable_dev,
 };
diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c
index ad297fb..284531b 100644
--- a/src/ec/acpi/ec.c
+++ b/src/ec/acpi/ec.c
@@ -138,6 +138,6 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
    ec_data_reg = data_reg;
 }

+DEVICE_NAME("ACPI Embedded Controller");
 struct chip_operations ec_acpi_ops = {
-	CHIP_NAME("ACPI Embedded Controller")
 };
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index ecd34b2..44cea01 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -163,7 +163,7 @@ static void h8_enable(device_t dev)
    h8_set_audio_mute(0);
 }

+DEVICE_NAME("Lenovo H8 EC");
 struct chip_operations ec_lenovo_h8_ops = {
-	CHIP_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 28f3814..b885ba5 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -117,8 +117,8 @@ static void enable_dev(device_t dev)
    	pmh7_touchpad_enable(val);
 }

+DEVICE_NAME("Lenovo Power Management Hardware Hub 7");
 struct chip_operations ec_lenovo_pmh7_ops = {
-	CHIP_NAME("Lenovo Power Management Hardware Hub 7")
    .enable_dev = enable_dev,
 };
 #endif
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c
index bfd3c14..6f9d019 100644
--- a/src/ec/smsc/mec1308/ec.c
+++ b/src/ec/smsc/mec1308/ec.c
@@ -129,7 +129,7 @@ static void mec1308_enable(device_t dev)
    }
 }

+DEVICE_NAME("SMSC MEC1308 EC Mailbox Interface");
 struct chip_operations ec_smsc_mec1308_ops = {
-	CHIP_NAME("SMSC MEC1308 EC Mailbox Interface")
    .enable_dev = mec1308_enable
 };
diff --git a/src/include/device/device.h b/src/include/device/device.h
index a32acc6..c6cac12 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -18,11 +18,8 @@ struct chip_operations {
    void (*enable_dev)(struct device *dev);
    void (*init)(void *chip_info);
    unsigned int initialized : 1;
-	const char *name;
 };

-#define CHIP_NAME(X) .name = X,
-
 #define __CONCAT1(x,y) x ## y
 #define __CONCAT2(x,y) __CONCAT1(x,y)
 #define CHIP_GLOBAL(f) __CONCAT2(__CHIP_PREFIX__,f)
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 16dcc3b..adaae8f 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -159,6 +159,5 @@ static void enable_dev(struct device *dev)
 }

struct chip_operations mainboard_emulation_qemu_x86_ops = {
-	CHIP_NAME("QEMU Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
index 9ba687f..740a6b0 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
+++ b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
@@ -47,6 +47,5 @@ static void enable_dev(struct device *dev)
 }

struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI PM-LX2-800-R10 Mainboard")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index 4bdc7b4..ea2880c 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -764,8 +764,8 @@ static const struct pci_driver mcf0_driver __pci_driver = {
    .device = 0x1200,
 };

+DEVICE_NAME("AMD FAM10 Northbridge");
 struct chip_operations northbridge_amd_agesa_family10_ops = {
-	CHIP_NAME("AMD FAM10 Northbridge")
    .enable_dev = 0,
 };

@@ -1454,8 +1454,8 @@ static void root_complex_enable_dev(struct device *dev)
    }
 }

+ROOT_COMPLEX_NAME("AMD FAM10 Root Complex");
 struct chip_operations northbridge_amd_agesa_family10_root_complex_ops = {
-	CHIP_NAME("AMD FAM10 Root Complex")
    .enable_dev = root_complex_enable_dev,
 };

diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index c4b43c5..c13da39 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -880,8 +880,8 @@ static const struct pci_driver northbridge_driver __pci_driver = {
 };

+DEVICE_NAME("AMD Family 12h Northbridge");
 struct chip_operations northbridge_amd_agesa_family12_ops = {
-    CHIP_NAME("AMD Family 12h Northbridge")
     .enable_dev = 0,
 };

@@ -931,7 +931,7 @@ static void root_complex_enable_dev(struct device *dev)
 }

+ROOT_COMPLEX_NAME("AMD Family 12h Root Complex");
 struct chip_operations northbridge_amd_agesa_family12_root_complex_ops = {
-    CHIP_NAME("AMD Family 12h Root Complex")
     .enable_dev = root_complex_enable_dev,
 };
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 5e8d89b..eec27a9 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -868,8 +868,8 @@ static const struct pci_driver northbridge_driver __pci_driver = {
    .device = 0x1510,
 };

+DEVICE_NAME("AMD Family 14h Northbridge");
 struct chip_operations northbridge_amd_agesa_family14_ops = {
-	CHIP_NAME("AMD Family 14h Northbridge")
    .enable_dev = 0,
 };

@@ -911,7 +911,7 @@ static void root_complex_enable_dev(struct device *dev)
    }
 }

+ROOT_COMPLEX_NAME("AMD Family 14h Root Complex");
 struct chip_operations northbridge_amd_agesa_family14_root_complex_ops = {
-	CHIP_NAME("AMD Family 14h Root Complex")
    .enable_dev = root_complex_enable_dev,
 };
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index abd53b2..3a45865 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -499,8 +499,8 @@ static const struct pci_driver family10_northbridge __pci_driver = {
    .device = PCI_DEVICE_ID_AMD_10H_NB_HT,
 };

+DEVICE_NAME("AMD FAM15 Northbridge");
 struct chip_operations northbridge_amd_agesa_family15_ops = {
-	CHIP_NAME("AMD FAM15 Northbridge")
    .enable_dev = 0,
 };

@@ -1143,8 +1143,8 @@ static void root_complex_enable_dev(struct device *dev)
 }

+ROOT_COMPLEX_NAME("AMD FAM15 Root Complex");
 struct chip_operations northbridge_amd_agesa_family15_root_complex_ops = {
-	CHIP_NAME("AMD FAM15 Root Complex")
    .enable_dev = root_complex_enable_dev,
 };

diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 5659ac6..0546972 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -491,8 +491,8 @@ static const struct pci_driver family10_northbridge __pci_driver = {
    .device = PCI_DEVICE_ID_AMD_10H_NB_HT,
 };

+DEVICE_NAME("AMD FAM15 Northbridge");
 struct chip_operations northbridge_amd_agesa_family15tn_ops = {
-	CHIP_NAME("AMD FAM15 Northbridge")
    .enable_dev = 0,
 };

@@ -1146,7 +1146,7 @@ static void root_complex_enable_dev(struct device *dev)
    }
 }

+ROOT_COMPLEX_NAME("AMD FAM15 Root Complex");
 struct chip_operations northbridge_amd_agesa_family15tn_root_complex_ops = {
-	CHIP_NAME("AMD FAM15 Root Complex")
    .enable_dev = root_complex_enable_dev,
 };
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 77dd138..4a662c5 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -624,8 +624,8 @@ static const struct pci_driver mcf0_driver __pci_driver = {
    .device = 0x1200,
 };

+DEVICE_NAME("AMD FAM10 Northbridge");
 struct chip_operations northbridge_amd_amdfam10_ops = {
-	CHIP_NAME("AMD FAM10 Northbridge")
    .enable_dev = 0,
 };

@@ -1477,7 +1477,7 @@ static void root_complex_enable_dev(struct device *dev)
    }
 }

+ROOT_COMPLEX_NAME("AMD FAM10 Root Complex");
 struct chip_operations northbridge_amd_amdfam10_root_complex_ops = {
-	CHIP_NAME("AMD FAM10 Root Complex")
    .enable_dev = root_complex_enable_dev,
 };
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 2f3d778..1ed0383 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -597,8 +597,8 @@ static const struct pci_driver mcf0_driver __pci_driver = {
    .device = 0x1100,
 };

+DEVICE_NAME("AMD K8 Northbridge");
 struct chip_operations northbridge_amd_amdk8_ops = {
-	CHIP_NAME("AMD K8 Northbridge")
    .enable_dev = 0,
 };

@@ -1363,7 +1363,7 @@ static void root_complex_enable_dev(struct device *dev)
    }
 }

+ROOT_COMPLEX_NAME("AMD K8 Root Complex");
 struct chip_operations northbridge_amd_amdk8_root_complex_ops = {
-	CHIP_NAME("AMD K8 Root Complex")
    .enable_dev = root_complex_enable_dev,
 };
diff --git a/src/northbridge/amd/cimx/rd890/late.c b/src/northbridge/amd/cimx/rd890/late.c
index 1a345a2..bd47ce5 100644
--- a/src/northbridge/amd/cimx/rd890/late.c
+++ b/src/northbridge/amd/cimx/rd890/late.c
@@ -111,8 +111,8 @@ static void rd890_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI rd890");
 struct chip_operations northbridge_amd_cimx_rd890_ops = {
-	CHIP_NAME("ATI rd890")
    .enable_dev = rd890_enable,
 };

diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c
index 83b84e3..781007e 100644
--- a/src/northbridge/amd/gx1/northbridge.c
+++ b/src/northbridge/amd/gx1/northbridge.c
@@ -167,7 +167,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("AMD GX1 Northbridge");
 struct chip_operations northbridge_amd_gx1_ops = {
-	CHIP_NAME("AMD GX1 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 80bcdf6..3f1ae39 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -355,7 +355,7 @@ static void enable_dev(struct device *dev)
    	dev->ops = &cpu_bus_ops;
 }

+DEVICE_NAME("AMD GX (previously GX2) Northbridge");
 struct chip_operations northbridge_amd_gx2_ops = {
-	CHIP_NAME("AMD GX (previously GX2) Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index aaaf46b..e0b9bc6 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -459,7 +459,7 @@ static void enable_dev(struct device *dev)
    	dev->ops = &cpu_bus_ops;
 }

+DEVICE_NAME("AMD LX Northbridge");
 struct chip_operations northbridge_amd_lx_ops = {
-	CHIP_NAME("AMD LX Northbridge")
        .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c
index e7d7d5d..71b3975 100644
--- a/src/northbridge/intel/e7501/northbridge.c
+++ b/src/northbridge/intel/e7501/northbridge.c
@@ -133,7 +133,7 @@ static void enable_dev(struct device *dev)
         }
 }

+DEVICE_NAME("Intel E7501 Northbridge");
 struct chip_operations northbridge_intel_e7501_ops = {
-	CHIP_NAME("Intel E7501 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index db0ece2..abb2bf5 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -145,8 +145,8 @@ static void enable_dev(struct device *dev)
         }
 }

+DEVICE_NAME("Intel E7505 Northbridge");
 struct chip_operations northbridge_intel_e7505_ops = {
-	CHIP_NAME("Intel E7505 Northbridge")
    .enable_dev = enable_dev,
 };

diff --git a/src/northbridge/intel/e7520/northbridge.c b/src/northbridge/intel/e7520/northbridge.c
index 962e8cd..4f7f9ba 100644
--- a/src/northbridge/intel/e7520/northbridge.c
+++ b/src/northbridge/intel/e7520/northbridge.c
@@ -208,7 +208,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel E7520 Northbridge");
 struct chip_operations northbridge_intel_e7520_ops = {
-	CHIP_NAME("Intel E7520 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/e7525/northbridge.c b/src/northbridge/intel/e7525/northbridge.c
index ceb7afa..82efd1d 100644
--- a/src/northbridge/intel/e7525/northbridge.c
+++ b/src/northbridge/intel/e7525/northbridge.c
@@ -208,7 +208,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel E7525 Northbridge");
 struct chip_operations northbridge_intel_e7525_ops = {
-	CHIP_NAME("Intel E7525 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 1839ec6..6479166 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -277,8 +277,8 @@ static void gm45_init(void *const chip_info)
    	pci_write_config32(d0f0, D0F0_DEVEN, deven & ~(1 << 14));
 }

+DEVICE_NAME("Intel GM45 Northbridge");
 struct chip_operations northbridge_intel_gm45_ops = {
-	CHIP_NAME("Intel GM45 Northbridge")
    .enable_dev = enable_dev,
    .init = gm45_init,
 };
diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c
index d90d0b5..209151b 100644
--- a/src/northbridge/intel/i3100/northbridge.c
+++ b/src/northbridge/intel/i3100/northbridge.c
@@ -229,7 +229,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel 3100 Northbridge");
 struct chip_operations northbridge_intel_i3100_ops = {
-	CHIP_NAME("Intel 3100 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index ccd5e9c..1828f7f 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -116,7 +116,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("Intel 82443BX (440BX) Northbridge");
 struct chip_operations northbridge_intel_i440bx_ops = {
-	CHIP_NAME("Intel 82443BX (440BX) Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c
index c75a4bb..b638bf2 100644
--- a/src/northbridge/intel/i440lx/northbridge.c
+++ b/src/northbridge/intel/i440lx/northbridge.c
@@ -145,7 +145,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("Intel 82443LX (440LX) Northbridge");
 struct chip_operations northbridge_intel_i440lx_ops = {
-	CHIP_NAME("Intel 82443LX (440LX) Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c
index 071616c..64d8fd8 100644
--- a/src/northbridge/intel/i5000/northbridge.c
+++ b/src/northbridge/intel/i5000/northbridge.c
@@ -190,7 +190,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel i5000 Northbridge");
 struct chip_operations northbridge_intel_i5000_ops = {
-	CHIP_NAME("Intel i5000 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index ed9876f..6771568 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -168,7 +168,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("Intel 82810 Northbridge");
 struct chip_operations northbridge_intel_i82810_ops = {
-	CHIP_NAME("Intel 82810 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index f2505bd..d9891ce 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -137,7 +137,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("Intel 82830 Northbridge");
 struct chip_operations northbridge_intel_i82830_ops = {
-	CHIP_NAME("Intel 82830 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c
index b1e150f..b594e5a 100644
--- a/src/northbridge/intel/i855/northbridge.c
+++ b/src/northbridge/intel/i855/northbridge.c
@@ -153,7 +153,7 @@ static void enable_dev(struct device *dev)
         }
 }

+DEVICE_NAME("Intel 855 Northbridge");
 struct chip_operations northbridge_intel_i855_ops = {
-        CHIP_NAME("Intel 855 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index c6c93e5..a00e636 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -312,7 +312,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel i945 Northbridge");
 struct chip_operations northbridge_intel_i945_ops = {
-	CHIP_NAME("Intel i945 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 8652838..40662e8 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -508,7 +508,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel i7 (SandyBridge/IvyBridge) integrated Northbridge");
 struct chip_operations northbridge_intel_sandybridge_ops = {
-	CHIP_NAME("Intel i7 (SandyBridge/IvyBridge) integrated Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index fe5881c..3b5c693 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -330,7 +330,7 @@ static void enable_dev(device_t dev)
    }
 }

+DEVICE_NAME("Intel SCH Northbridge");
 struct chip_operations northbridge_intel_sch_ops = {
-	CHIP_NAME("Intel SCH Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/rdc/r8610/northbridge.c b/src/northbridge/rdc/r8610/northbridge.c
index ebcccff..15c8450 100644
--- a/src/northbridge/rdc/r8610/northbridge.c
+++ b/src/northbridge/rdc/r8610/northbridge.c
@@ -127,7 +127,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("RDC R8610 Northbridge");
 struct chip_operations northbridge_rdc_r8610_ops = {
-	CHIP_NAME("RDC R8610 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index ab9f084..ca09295 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -273,7 +273,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("VIA CN400 Northbridge");
 struct chip_operations northbridge_via_cn400_ops = {
-	CHIP_NAME("VIA CN400 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index 86c11a8..f993e5a 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -193,7 +193,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("VIA CN700 Northbridge");
 struct chip_operations northbridge_via_cn700_ops = {
-	CHIP_NAME("VIA CN700 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index ce5edf8..3e4fa18 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -123,7 +123,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("VIA CX700 Northbridge");
 struct chip_operations northbridge_via_cx700_ops = {
-	CHIP_NAME("VIA CX700 Northbridge")
    .enable_dev = enable_dev
 };
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index 950d683..417fc7b 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -138,7 +138,7 @@ static void enable_dev(struct device *dev)
         }
 }

+DEVICE_NAME("VIA VT8601 Northbridge");
 struct chip_operations northbridge_via_vt8601_ops = {
-	CHIP_NAME("VIA VT8601 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index e061155..0b6a045 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -200,7 +200,7 @@ static void enable_dev(struct device *dev)
         }
 }

+DEVICE_NAME("VIA VT8623 Northbridge");
 struct chip_operations northbridge_via_vt8623_ops = {
-	CHIP_NAME("VIA VT8623 Northbridge")
    .enable_dev = enable_dev,
 };
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 4e0a36d..c1a6134 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -171,7 +171,7 @@ static void enable_dev(struct device *dev)
    }
 }

+DEVICE_NAME("VIA VX800 Chipset");
 struct chip_operations northbridge_via_vx800_ops = {
-	CHIP_NAME("VIA VX800 Chipset")
        .enable_dev = enable_dev,
 };
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index ce541fc..f7aee0c 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -116,7 +116,7 @@ struct cbmem_entry *get_cbmem_toc(void)
 }

+DEVICE_NAME("ATI HUDSON");
 struct chip_operations southbridge_amd_agesa_hudson_ops = {
-	CHIP_NAME("ATI HUDSON")
    .enable_dev = hudson_enable,
 };
diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 2707ca6..31f9364 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -64,8 +64,8 @@ void amd8111_enable(device_t dev)
    }
 }

+DEVICE_NAME("AMD-8111 Southbridge");
 struct chip_operations southbridge_amd_amd8111_ops = {
-	CHIP_NAME("AMD-8111 Southbridge")
    /* This only called when this device is listed in the
    * static device tree.
    */
diff --git a/src/southbridge/amd/cimx/sb700/late.c b/src/southbridge/amd/cimx/sb700/late.c
index be2b8cd..97582b4 100644
--- a/src/southbridge/amd/cimx/sb700/late.c
+++ b/src/southbridge/amd/cimx/sb700/late.c
@@ -290,8 +290,8 @@ static void sb700_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI SB700");
 struct chip_operations southbridge_amd_cimx_sb700_ops = {
-	CHIP_NAME("ATI SB700")
    .enable_dev = sb700_enable,
 };

diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index 6067e39..0d0fc5b 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -491,7 +491,7 @@ static void sb800_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI SB800");
 struct chip_operations southbridge_amd_cimx_sb800_ops = {
-	CHIP_NAME("ATI SB800")
    .enable_dev = sb800_enable,
 };
diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c
index 85485ed..4ad2f3a 100644
--- a/src/southbridge/amd/cimx/sb900/late.c
+++ b/src/southbridge/amd/cimx/sb900/late.c
@@ -473,7 +473,7 @@ static void sb900_enable(device_t dev)
    //AmdSbDispatcher(sb_config);
 }

+DEVICE_NAME("ATI SB900");
 struct chip_operations southbridge_amd_cimx_sb900_ops = {
-	CHIP_NAME("ATI SB900")
    .enable_dev = sb900_enable,
 };
diff --git a/src/southbridge/amd/cs5530/cs5530.c b/src/southbridge/amd/cs5530/cs5530.c
index 26ec1f7..0131ee3 100644
--- a/src/southbridge/amd/cs5530/cs5530.c
+++ b/src/southbridge/amd/cs5530/cs5530.c
@@ -53,7 +53,7 @@ void cs5530_enable(device_t dev)
 {
 }

+DEVICE_NAME("AMD Geode CS5530/CS5530A I/O Companion Southbridge");
 struct chip_operations southbridge_amd_cs5530_ops = {
-	CHIP_NAME("AMD Geode CS5530/CS5530A I/O Companion Southbridge")
    .enable_dev = cs5530_enable,
 };
diff --git a/src/southbridge/amd/cs5535/cs5535.c b/src/southbridge/amd/cs5535/cs5535.c
index 42707c0..1925852 100644
--- a/src/southbridge/amd/cs5535/cs5535.c
+++ b/src/southbridge/amd/cs5535/cs5535.c
@@ -103,8 +103,8 @@ static const struct pci_driver cs5535_pci_driver __pci_driver = {
    .device = PCI_DEVICE_ID_NS_CS5535
 };

+DEVICE_NAME("AMD Geode CS5535 Southbridge");
 struct chip_operations southbridge_amd_cs5535_ops = {
-        CHIP_NAME("AMD Geode CS5535 Southbridge")
             /* This is only called when this device is listed in the
              * static device tree.
              */
diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c
index 0c0368f..57ee15f 100644
--- a/src/southbridge/amd/cs5536/cs5536.c
+++ b/src/southbridge/amd/cs5536/cs5536.c
@@ -702,8 +702,8 @@ static const struct pci_driver cs5536_pci_driver __pci_driver = {
    .device = PCI_DEVICE_ID_AMD_CS5536_ISA
 };

+DEVICE_NAME("AMD Geode CS5536 Southbridge");
 struct chip_operations southbridge_amd_cs5536_ops = {
-	CHIP_NAME("AMD Geode CS5536 Southbridge")
        /* This is only called when this device is listed in the
         * static device tree.
         */
diff --git a/src/southbridge/amd/rs690/rs690.c b/src/southbridge/amd/rs690/rs690.c
index 0d6db72..d814850 100644
--- a/src/southbridge/amd/rs690/rs690.c
+++ b/src/southbridge/amd/rs690/rs690.c
@@ -192,7 +192,7 @@ void rs690_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI RS690");
 struct chip_operations southbridge_amd_rs690_ops = {
-	CHIP_NAME("ATI RS690")
    .enable_dev = rs690_enable,
 };
diff --git a/src/southbridge/amd/rs780/rs780.c b/src/southbridge/amd/rs780/rs780.c
index f1029ca..deafc96 100644
--- a/src/southbridge/amd/rs780/rs780.c
+++ b/src/southbridge/amd/rs780/rs780.c
@@ -371,7 +371,7 @@ void rs780_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI RS780");
 struct chip_operations southbridge_amd_rs780_ops = {
-	CHIP_NAME("ATI RS780")
    .enable_dev = rs780_enable,
 };
diff --git a/src/southbridge/amd/sb600/sb600.c b/src/southbridge/amd/sb600/sb600.c
index 61a0c65..bbc9dce 100644
--- a/src/southbridge/amd/sb600/sb600.c
+++ b/src/southbridge/amd/sb600/sb600.c
@@ -225,7 +225,7 @@ void sb600_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI SB600");
 struct chip_operations southbridge_amd_sb600_ops = {
-	CHIP_NAME("ATI SB600")
    .enable_dev = sb600_enable,
 };
diff --git a/src/southbridge/amd/sb700/sb700.c b/src/southbridge/amd/sb700/sb700.c
index 304bd07..ff6a7fc 100644
--- a/src/southbridge/amd/sb700/sb700.c
+++ b/src/southbridge/amd/sb700/sb700.c
@@ -227,13 +227,13 @@ void sb7xx_51xx_enable(device_t dev)
 }

#if CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100
+DEVICE_NAME("ATI SP5100");
 struct chip_operations southbridge_amd_sb700_ops = {
-	CHIP_NAME("ATI SP5100")
    .enable_dev = sb7xx_51xx_enable,
 };
 #else
+DEVICE_NAME("ATI SB700");
 struct chip_operations southbridge_amd_sb700_ops = {
-	CHIP_NAME("ATI SB700")
    .enable_dev = sb7xx_51xx_enable,
 };
 #endif
diff --git a/src/southbridge/amd/sb800/sb800.c b/src/southbridge/amd/sb800/sb800.c
index f6b7d80..3ebbd50 100644
--- a/src/southbridge/amd/sb800/sb800.c
+++ b/src/southbridge/amd/sb800/sb800.c
@@ -387,7 +387,7 @@ void sb800_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI SB800");
 struct chip_operations southbridge_amd_sb800_ops = {
-	CHIP_NAME("ATI SB800")
    .enable_dev = sb800_enable,
 };
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c
index 14b919d..a018e46 100644
--- a/src/southbridge/amd/sr5650/sr5650.c
+++ b/src/southbridge/amd/sr5650/sr5650.c
@@ -437,7 +437,7 @@ void sr5650_enable(device_t dev)
    }
 }

+DEVICE_NAME("ATI SR5650");
 struct chip_operations southbridge_amd_sr5650_ops = {
-	CHIP_NAME("ATI SR5650")
    .enable_dev = sr5650_enable,
 };
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index 207c4c2..ad16392 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -89,7 +89,7 @@ void bcm5785_enable(device_t dev)
 #endif
 }

+DEVICE_NAME("Serverworks BCM5785 Southbridge");
 struct chip_operations southbridge_broadcom_bcm5785_ops = {
-	CHIP_NAME("Serverworks BCM5785 Southbridge")
    .enable_dev = bcm5785_enable,
 };
diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c
index d8a919d..4bf6244 100644
--- a/src/southbridge/intel/bd82x6x/pch.c
+++ b/src/southbridge/intel/bd82x6x/pch.c
@@ -404,7 +404,7 @@ void pch_enable(device_t dev)
    }
 }

+DEVICE_NAME("Intel Series 6/7 (Cougar Point/Panther Point) Southbridge");
 struct chip_operations southbridge_intel_bd82x6x_ops = {
-	CHIP_NAME("Intel Series 6/7 (Cougar Point/Panther Point) Southbridge")
    .enable_dev = pch_enable,
 };
diff --git a/src/southbridge/intel/esb6300/esb6300.c b/src/southbridge/intel/esb6300/esb6300.c
index 5d8f5e4..72da200 100644
--- a/src/southbridge/intel/esb6300/esb6300.c
+++ b/src/southbridge/intel/esb6300/esb6300.c
@@ -42,7 +42,7 @@ void esb6300_enable(device_t dev)

}

+DEVICE_NAME("Intel 6300ESB Southbridge");
 struct chip_operations southbridge_intel_esb6300_ops = {
-	CHIP_NAME("Intel 6300ESB Southbridge")
    .enable_dev = esb6300_enable,
 };
diff --git a/src/southbridge/intel/i3100/i3100.c b/src/southbridge/intel/i3100/i3100.c
index 69ee7bd..70389ae 100644
--- a/src/southbridge/intel/i3100/i3100.c
+++ b/src/southbridge/intel/i3100/i3100.c
@@ -57,6 +57,6 @@ void i3100_enable(device_t dev)
    pci_write_config32(lpc_dev, 0xf0, 0);
 }

+DEVICE_NAME("Intel 3100 Southbridge");
 struct chip_operations southbridge_intel_i3100_ops = {
-	CHIP_NAME("Intel 3100 Southbridge")
 };
diff --git a/src/southbridge/intel/i82371eb/i82371eb.c b/src/southbridge/intel/i82371eb/i82371eb.c
index 9b12eb7..e5350ee 100644
--- a/src/southbridge/intel/i82371eb/i82371eb.c
+++ b/src/southbridge/intel/i82371eb/i82371eb.c
@@ -58,7 +58,7 @@ void i82371eb_enable(struct device *dev)
    /* TODO: Nothing to do? */
 }

+DEVICE_NAME("Intel 82371FB/SB/MX/AB/EB/MB Southbridge");
 const struct chip_operations southbridge_intel_i82371eb_ops = {
-	CHIP_NAME("Intel 82371FB/SB/MX/AB/EB/MB Southbridge")
    .enable_dev = i82371eb_enable,
 };
diff --git a/src/southbridge/intel/i82801ax/i82801ax.c b/src/southbridge/intel/i82801ax/i82801ax.c
index 7f4c731..200ddd7 100644
--- a/src/southbridge/intel/i82801ax/i82801ax.c
+++ b/src/southbridge/intel/i82801ax/i82801ax.c
@@ -44,7 +44,7 @@ void i82801ax_enable(device_t dev)
    pci_write_config16(lpc_dev, FUNC_DIS, reg16);
 }

+DEVICE_NAME("Intel ICH/ICH0 (82801AA/AB) Series Southbridge");
 struct chip_operations southbridge_intel_i82801ax_ops = {
-	CHIP_NAME("Intel ICH/ICH0 (82801AA/AB) Series Southbridge")
    .enable_dev = i82801ax_enable,
 };
diff --git a/src/southbridge/intel/i82801bx/i82801bx.c b/src/southbridge/intel/i82801bx/i82801bx.c
index 7f59977..7da91ae 100644
--- a/src/southbridge/intel/i82801bx/i82801bx.c
+++ b/src/southbridge/intel/i82801bx/i82801bx.c
@@ -44,7 +44,7 @@ void i82801bx_enable(device_t dev)
    pci_write_config16(lpc_dev, FUNC_DIS, reg16);
 }

+DEVICE_NAME("Intel ICH2 (82801Bx) Series Southbridge");
 struct chip_operations southbridge_intel_i82801bx_ops = {
-	CHIP_NAME("Intel ICH2 (82801Bx) Series Southbridge")
    .enable_dev = i82801bx_enable,
 };
diff --git a/src/southbridge/intel/i82801cx/i82801cx.c b/src/southbridge/intel/i82801cx/i82801cx.c
index 685c931..a843c16 100644
--- a/src/southbridge/intel/i82801cx/i82801cx.c
+++ b/src/southbridge/intel/i82801cx/i82801cx.c
@@ -47,7 +47,7 @@ void i82801cx_enable(device_t dev)
    }
 }

+DEVICE_NAME("Intel ICH3 (82801Cx) Series Southbridge");
 struct chip_operations southbridge_intel_i82801cx_ops = {
-	CHIP_NAME("Intel ICH3 (82801Cx) Series Southbridge")
    .enable_dev = i82801cx_enable,
 };
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index ac904ef..d5aaff3 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -80,7 +80,7 @@ void i82801dx_enable(device_t dev)
    }
 }

+DEVICE_NAME("Intel ICH4/ICH4-M (82801Dx) Series Southbridge");
 struct chip_operations southbridge_intel_i82801dx_ops = {
-	CHIP_NAME("Intel ICH4/ICH4-M (82801Dx) Series Southbridge")
        .enable_dev = i82801dx_enable,
 };
diff --git a/src/southbridge/intel/i82801ex/i82801ex.c b/src/southbridge/intel/i82801ex/i82801ex.c
index fc41645..3f6a44e 100644
--- a/src/southbridge/intel/i82801ex/i82801ex.c
+++ b/src/southbridge/intel/i82801ex/i82801ex.c
@@ -42,7 +42,7 @@ void i82801ex_enable(device_t dev)

}

+DEVICE_NAME("Intel ICH5 (82801Ex) Series Southbridge");
 struct chip_operations southbridge_intel_i82801ex_ops = {
-	CHIP_NAME("Intel ICH5 (82801Ex) Series Southbridge")
    .enable_dev = i82801ex_enable,
 };
diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c
index fb8e952..e702552 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.c
+++ b/src/southbridge/intel/i82801gx/i82801gx.c
@@ -33,7 +33,7 @@ void i82801gx_enable(device_t dev)
    pci_write_config32(dev, PCI_COMMAND, reg32);
 }

+DEVICE_NAME("Intel ICH7/ICH7-M (82801Gx) Series Southbridge");
 struct chip_operations southbridge_intel_i82801gx_ops = {
-	CHIP_NAME("Intel ICH7/ICH7-M (82801Gx) Series Southbridge")
    .enable_dev = i82801gx_enable,
 };
diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c
index 99e7ca1..13f4c01 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.c
+++ b/src/southbridge/intel/i82801ix/i82801ix.c
@@ -257,8 +257,8 @@ static void i82801ix_init(void *chip_info)
 #endif
 }

+DEVICE_NAME("Intel ICH9/ICH9-M (82801Ix) Series Southbridge");
 struct chip_operations southbridge_intel_i82801ix_ops = {
-	CHIP_NAME("Intel ICH9/ICH9-M (82801Ix) Series Southbridge")
    .enable_dev	= i82801ix_enable_device,
    .init		= i82801ix_init,
 };
diff --git a/src/southbridge/intel/pxhd/bridge.c b/src/southbridge/intel/pxhd/bridge.c
index 1134f8f..31774d4 100644
--- a/src/southbridge/intel/pxhd/bridge.c
+++ b/src/southbridge/intel/pxhd/bridge.c
@@ -206,7 +206,7 @@ static const struct pci_driver ioapic2_driver __pci_driver = {

};

+DEVICE_NAME("Intel PXHD Southbridge");
 struct chip_operations southbridge_intel_pxhd_ops = {
-	CHIP_NAME("Intel PXHD Southbridge")
    .enable_dev = pxhd_enable,
 };
diff --git a/src/southbridge/intel/sch/south.c b/src/southbridge/intel/sch/south.c
index a98982d..bbc56c8 100644
--- a/src/southbridge/intel/sch/south.c
+++ b/src/southbridge/intel/sch/south.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>

+DEVICE_NAME("Intel SCH Southbridge");
 struct chip_operations southbridge_intel_sch_ops = {
-	CHIP_NAME("Intel SCH Southbridge")
 };
diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c
index 39c3051..5608635 100644
--- a/src/southbridge/nvidia/ck804/ck804.c
+++ b/src/southbridge/nvidia/ck804/ck804.c
@@ -198,7 +198,7 @@ struct pci_operations ck804_pci_ops = {
    .set_subsystem = ck804_set_subsystem,
 };

+DEVICE_NAME("NVIDIA CK804 Southbridge");
 struct chip_operations southbridge_nvidia_ck804_ops = {
-	CHIP_NAME("NVIDIA CK804 Southbridge")
    .enable_dev = ck804_enable,
 };
diff --git a/src/southbridge/nvidia/mcp55/mcp55.c b/src/southbridge/nvidia/mcp55/mcp55.c
index e87b486..4ff1d40 100644
--- a/src/southbridge/nvidia/mcp55/mcp55.c
+++ b/src/southbridge/nvidia/mcp55/mcp55.c
@@ -244,7 +244,7 @@ struct pci_operations mcp55_pci_ops = {
    .set_subsystem = mcp55_set_subsystem,
 };

+DEVICE_NAME("NVIDIA MCP55 Southbridge");
 struct chip_operations southbridge_nvidia_mcp55_ops = {
-	CHIP_NAME("NVIDIA MCP55 Southbridge")
    .enable_dev = mcp55_enable,
 };
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index 0efcafa..f7fcae0 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -235,7 +235,7 @@ static void southbridge_init(device_t dev)
    enable_cf_boot = conf->enable_cf;
 }

+DEVICE_NAME("Ricoh RL5C476 CardBus Controller");
 struct chip_operations southbridge_ricoh_rl5c476_ops = {
-	CHIP_NAME("Ricoh RL5C476 CardBus Controller")
    .enable_dev    = southbridge_init,
 };
diff --git a/src/southbridge/sis/sis966/sis966.c b/src/southbridge/sis/sis966/sis966.c
index 3d7b0f7..6c7a2f6 100644
--- a/src/southbridge/sis/sis966/sis966.c
+++ b/src/southbridge/sis/sis966/sis966.c
@@ -194,7 +194,7 @@ void sis966_enable(device_t dev)
    }
 }

+DEVICE_NAME("SiS SiS966 Southbridge");
 struct chip_operations southbridge_sis_sis966_ops = {
-	CHIP_NAME("SiS SiS966 Southbridge")
    .enable_dev	= sis966_enable,
 };
diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c
index e59be4f..6a3b43d 100644
--- a/src/southbridge/ti/pci1x2x/pci1x2x.c
+++ b/src/southbridge/ti/pci1x2x/pci1x2x.c
@@ -92,6 +92,6 @@ static const struct pci_driver ti_pci1520_driver __pci_driver = {
    .device = PCI_DEVICE_ID_TI_1520,
 };

+DEVICE_NAME("TI PCI1x2x Cardbus controller");
 struct chip_operations southbridge_ti_pci1x2x_ops = {
-	CHIP_NAME("TI PCI1x2x Cardbus controller")
 };
diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c
index 2ab383b..9b9703d 100644
--- a/src/southbridge/ti/pci7420/cardbus.c
+++ b/src/southbridge/ti/pci7420/cardbus.c
@@ -122,7 +122,7 @@ static void ti_pci7420_enable_dev(device_t dev)
    /* Nothing here yet */
 }

+DEVICE_NAME("Texas Instruments PCI7420/7620 Cardbus Controller");
 struct chip_operations southbridge_ti_pci7420_ops = {
-	CHIP_NAME("Texas Instruments PCI7420/7620 Cardbus Controller")
    .enable_dev    = ti_pci7420_enable_dev,
 };
diff --git a/src/southbridge/ti/pci7420/firewire.c b/src/southbridge/ti/pci7420/firewire.c
index bd09c2fd..8ff14e0 100644
--- a/src/southbridge/ti/pci7420/firewire.c
+++ b/src/southbridge/ti/pci7420/firewire.c
@@ -60,7 +60,7 @@ static void ti_pci7420_firewire_enable_dev(device_t dev)
    /* Nothing here yet */
 }

+DEVICE_NAME("Texas Instruments PCI7420/7620 FireWire (IEEE 1394)");
 struct chip_operations southbridge_ti_pci7420_firewire_ops = {
-	CHIP_NAME("Texas Instruments PCI7420/7620 FireWire (IEEE 1394)")
    .enable_dev    = ti_pci7420_firewire_enable_dev,
 };
diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c
index 5e62292..5db516a 100644
--- a/src/southbridge/ti/pcixx12/pcixx12.c
+++ b/src/southbridge/ti/pcixx12/pcixx12.c
@@ -63,7 +63,7 @@ static void southbridge_init(device_t dev)
 {
 }

+DEVICE_NAME("Texas Instruments PCIxx12 Cardbus Controller");
 struct chip_operations southbridge_ti_pcixx12_ops = {
-	CHIP_NAME("Texas Instruments PCIxx12 Cardbus Controller")
    .enable_dev    = southbridge_init,
 };
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index 85f007a..eb46651 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -61,7 +61,7 @@ static void vt8231_enable(struct device *dev)
    }
 }

+DEVICE_NAME("VIA VT8231 Southbridge");
 struct chip_operations southbridge_via_vt8231_ops = {
-	CHIP_NAME("VIA VT8231 Southbridge")
    .enable_dev	= vt8231_enable,
 };
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index 4fa2784..b32a98c 100644
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -83,7 +83,7 @@ static void vt8235_enable(struct device *dev)
    pci_write_config8(dev, 0x50, regval);
 }

+DEVICE_NAME("VIA VT8235 Southbridge");
 struct chip_operations southbridge_via_vt8235_ops = {
-	CHIP_NAME("VIA VT8235 Southbridge")
    .enable_dev = vt8235_enable,
 };
diff --git a/src/southbridge/via/vt8237r/vt8237r.c b/src/southbridge/via/vt8237r/vt8237r.c
index 586df66..c3ce7e8 100644
--- a/src/southbridge/via/vt8237r/vt8237r.c
+++ b/src/southbridge/via/vt8237r/vt8237r.c
@@ -85,7 +85,7 @@ static void vt8237r_enable(struct device *dev)
    /* TODO: If SATA is disabled, move IDE to fn0 to conform PCI specs. */
 }

+DEVICE_NAME("VIA VT8237R Southbridge");
 struct chip_operations southbridge_via_vt8237r_ops = {
-	CHIP_NAME("VIA VT8237R Southbridge")
    .enable_dev = vt8237r_enable,
 };
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index afe5b8c..577d025 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -91,7 +91,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F71805F/FG Super I/O");
 struct chip_operations superio_fintek_f71805f_ops = {
-	CHIP_NAME("Fintek F71805F/FG Super I/O")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index a0158ba..65b1c13 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -86,7 +86,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F71859 Super I/O");
 struct chip_operations superio_fintek_f71859_ops = {
-	CHIP_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 62f5f8c..7d8bf28 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -104,7 +104,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F71863FG Super I/O");
 struct chip_operations superio_fintek_f71863fg_ops = {
-	CHIP_NAME("Fintek F71863FG Super I/O")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 987f536..ceee071 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -100,7 +100,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F71872 Super I/O");
 struct chip_operations superio_fintek_f71872_ops = {
-	CHIP_NAME("Fintek F71872 Super I/O")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index bed421a..5757d11 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -103,7 +103,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F71889 Super I/O");
 struct chip_operations superio_fintek_f71889_ops = {
-	CHIP_NAME("Fintek F71889 Super I/O")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 7c5c2d2..260d923 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -99,7 +99,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Fintek F81865F Super I/O");
 struct chip_operations superio_fintek_f81865f_ops = {
-	CHIP_NAME("Fintek F81865F Super I/O")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c
index b8c107d..976941a 100644
--- a/src/superio/intel/i3100/superio.c
+++ b/src/superio/intel/i3100/superio.c
@@ -83,7 +83,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Intel 3100 Super I/O");
 struct chip_operations superio_intel_i3100_ops = {
-	CHIP_NAME("Intel 3100 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index a348a7f..ab3e38c 100644
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -61,7 +61,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8661F Super I/O");
 struct chip_operations superio_ite_it8661f_ops = {
-	CHIP_NAME("ITE IT8661F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 4b55772..631a25d 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -67,7 +67,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8671F Super I/O");
 struct chip_operations superio_ite_it8671f_ops = {
-	CHIP_NAME("ITE IT8671F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index 9103800..80692f0 100644
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -69,7 +69,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8673F Super I/O");
 struct chip_operations superio_ite_it8673f_ops = {
-	CHIP_NAME("ITE IT8673F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 8992ea2..7650db9 100644
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -67,7 +67,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8705F Super I/O");
 struct chip_operations superio_ite_it8705f_ops = {
-	CHIP_NAME("ITE IT8705F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 0265d35..e0b7374 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -122,7 +122,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8712F Super I/O");
 struct chip_operations superio_ite_it8712f_ops = {
-	CHIP_NAME("ITE IT8712F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index e04eb18..8c6de43 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -145,7 +145,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8716F Super I/O");
 struct chip_operations superio_ite_it8716f_ops = {
-	CHIP_NAME("ITE IT8716F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 8a6c8b8..6d0a6ce 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8718F Super I/O");
 struct chip_operations superio_ite_it8718f_ops = {
-	CHIP_NAME("ITE IT8718F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index 846afef..8e23a1c 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -72,7 +72,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8721F Super I/O");
 struct chip_operations superio_ite_it8721f_ops = {
-	CHIP_NAME("ITE IT8721F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 1361ef2..9b0fc6d 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -244,7 +244,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("ITE IT8772F Super I/O");
 struct chip_operations superio_ite_it8772f_ops = {
-	CHIP_NAME("ITE IT8772F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index a018766..157297f 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -68,7 +68,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC8374 Super I/O");
 struct chip_operations superio_nsc_pc8374_ops = {
-	CHIP_NAME("NSC PC8374 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 6e56e38..4f2698e 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -65,7 +65,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87309 Super I/O");
 struct chip_operations superio_nsc_pc87309_ops = {
-	CHIP_NAME("NSC PC87309 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 35725d6..7ad73cc 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87351 Super I/O");
 struct chip_operations superio_nsc_pc87351_ops = {
-	CHIP_NAME("NSC PC87351 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 0a67dcf..26f32f9 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87360 Super I/O");
 struct chip_operations superio_nsc_pc87360_ops = {
-	CHIP_NAME("NSC PC87360 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 9b58df6..4873fb9 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -72,7 +72,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87366 Super I/O");
 struct chip_operations superio_nsc_pc87366_ops = {
-	CHIP_NAME("NSC PC87366 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 3c714a6..6a8ce04 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -63,7 +63,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87382 Docking LPC Switch");
 struct chip_operations superio_nsc_pc87382_ops = {
-	CHIP_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 4b1963c..cb65e43 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -48,7 +48,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87384 Super I/O");
 struct chip_operations superio_nsc_pc87384_ops = {
-	CHIP_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 8a2e5c8..083d6f2 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -56,7 +56,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87392 Super I/O");
 struct chip_operations superio_nsc_pc87392_ops = {
-	CHIP_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 a9e8823..44f2407 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -72,7 +72,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87417 Super I/O");
 struct chip_operations superio_nsc_pc87417_ops = {
-	CHIP_NAME("NSC PC87417 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index f2e8d9f..e0717ad 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC87427 Super I/O");
 struct chip_operations superio_nsc_pc87427_ops = {
-	CHIP_NAME("NSC PC87427 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index db10a75..b83ca21 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -80,7 +80,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC97307 Super I/O");
 struct chip_operations superio_nsc_pc97307_ops = {
-	CHIP_NAME("NSC PC97307 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 7157f9b..8a1d649 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NSC PC97317 Super I/O");
 struct chip_operations superio_nsc_pc97317_ops = {
-	CHIP_NAME("NSC PC97317 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 5ce1d2a..3e8910c 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -62,7 +62,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("NUVOTON WPCM450 Super I/O");
 struct chip_operations superio_nuvoton_wpcm450_ops = {
-	CHIP_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 a098493..8aad60b 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -68,7 +68,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Renesas M3885x Super I/O");
 struct chip_operations superio_renesas_m3885x_ops = {
-	CHIP_NAME("Renesas M3885x Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index c49e978..3d67e00 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -67,7 +67,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("SMSC FDC37M60X Super I/O");
 struct chip_operations superio_smsc_fdc37m60x_ops = {
-	CHIP_NAME("SMSC FDC37M60X Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index 9f94909..b597e57 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -64,8 +64,8 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("SMSC FDC37N972 Super I/O");
 struct chip_operations superio_smsc_fdc37n972_ops = {
-	CHIP_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 405b90e..5fa1cbc 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -41,8 +41,8 @@ static void kbc1100_init(device_t dev);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC KBC1100 Super I/O");
 struct chip_operations superio_smsc_kbc1100_ops = {
-  CHIP_NAME("SMSC KBC1100 Super I/O")
   .enable_dev = enable_dev
 };

diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 15e486c..2493aa9 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -46,8 +46,8 @@ static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);
 // static void dump_pnp_device(device_t dev);

+DEVICE_NAME("SMSC LPC47B272 Super I/O");
 struct chip_operations superio_smsc_lpc47b272_ops = {
-	CHIP_NAME("SMSC LPC47B272 Super I/O")
    .enable_dev = enable_dev
 };

diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index c83ab34..83c1828 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -193,7 +193,7 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("SMSC LPC47B397 Super I/O");
 struct chip_operations superio_smsc_lpc47b397_ops = {
-	CHIP_NAME("SMSC LPC47B397 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index b422ea0..85d6bd6 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -45,8 +45,8 @@ static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);
 // static void dump_pnp_device(device_t dev);

+DEVICE_NAME("SMSC LPC47M10x Super I/O");
 struct chip_operations superio_smsc_lpc47m10x_ops = {
-	CHIP_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 c3117b2..11a5106 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -41,8 +41,8 @@ static void lpc47m15x_init(device_t dev);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC LPC47M15x/192/997 Super I/O");
 struct chip_operations superio_smsc_lpc47m15x_ops = {
-	CHIP_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 d6c153d..38988a7 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -48,8 +48,8 @@ static void lpc47n217_pnp_set_enable(device_t dev, int enable);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC LPC47N217 Super I/O");
 struct chip_operations superio_smsc_lpc47n217_ops = {
-	CHIP_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 2f877a0..a6d1515 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -46,8 +46,8 @@ void lpc47n227_pnp_set_enable(device_t dev, int enable);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC LPC47N227 Super I/O");
 struct chip_operations superio_smsc_lpc47n227_ops = {
-	CHIP_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 0de06f8..66f6432 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -113,8 +113,8 @@ static void enable_dev(device_t dev)
    		   ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("SMSC MEC1308 EC SuperIO Interface");
 struct chip_operations superio_smsc_mec1308_ops = {
-	CHIP_NAME("SMSC MEC1308 EC SuperIO Interface")
    .enable_dev = enable_dev
 };

diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index b99d7f7..56f8348 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -41,8 +41,8 @@ static void sch4037_init(device_t dev);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC SCH4037 Super I/O");
 struct chip_operations superio_smsc_sch4037_ops = {
-	CHIP_NAME("SMSC SCH4037 Super I/O")
    	.enable_dev = enable_dev,
 };

diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index d1acb90..01caa6e 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -41,8 +41,8 @@ static void sio1036_init(device_t dev);
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);

+DEVICE_NAME("SMSC SIO1036 Super I/O");
 struct chip_operations superio_smsc_sio1036_ops = {
-	CHIP_NAME("SMSC SIO1036 Super I/O")
    	.enable_dev = enable_dev
 };

diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index 66e3c87..d1af5df 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -64,8 +64,8 @@ static void enable_dev(struct device *dev)
    	ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("SMSC SIO10N268 Super I/O");
 struct chip_operations superio_smsc_sio10n268_ops = {
-	CHIP_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 a2358a4..03a9329 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -347,7 +347,7 @@ static void enable_dev(device_t dev)
    	pnp_dev_info[j].function = tmp[j];
 }

+DEVICE_NAME("Various SMSC Super I/Os");
 struct chip_operations superio_smsc_smscsuperio_ops = {
-	CHIP_NAME("Various SMSC Super I/Os")
    .enable_dev = enable_dev
 };
diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index abcae77..1343b8d 100644
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -211,7 +211,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("VIA VT1211 Super I/O");
 struct chip_operations superio_via_vt1211_ops = {
-	CHIP_NAME("VIA VT1211 Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index a936ce1..5321e6b 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -105,7 +105,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83627DHG Super I/O");
 struct chip_operations superio_winbond_w83627dhg_ops = {
-	CHIP_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 f40bec6..19bc686 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -191,7 +191,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83627EHG Super I/O");
 struct chip_operations superio_winbond_w83627ehg_ops = {
-	CHIP_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 da286a0..70d7c6b 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -189,7 +189,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83627HF Super I/O");
 struct chip_operations superio_winbond_w83627hf_ops = {
-	CHIP_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 d42f461..01e8de7 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -102,7 +102,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83627THG Super I/O");
 struct chip_operations superio_winbond_w83627thg_ops = {
-	CHIP_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 f606948..578f499 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -153,7 +153,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83627UHG Super I/O");
 struct chip_operations superio_winbond_w83627uhg_ops = {
-	CHIP_NAME("Winbond W83627UHG Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index cdf7ecd..90209b9 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -129,7 +129,7 @@ static void enable_dev(struct device *dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83697HF Super I/O");
 struct chip_operations superio_winbond_w83697hf_ops = {
-	CHIP_NAME("Winbond W83697HF Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 353d428..e51731f 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -100,7 +100,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83977F Super I/O");
 struct chip_operations superio_winbond_w83977f_ops = {
-	CHIP_NAME("Winbond W83977F Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index eabf080..28b5fb7 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -101,7 +101,7 @@ static void enable_dev(device_t dev)
    pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

+DEVICE_NAME("Winbond W83977TF Super I/O");
 struct chip_operations superio_winbond_w83977tf_ops = {
-	CHIP_NAME("Winbond W83977TF Super I/O")
    .enable_dev = enable_dev,
 };
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 8dfd50c..d368b7d 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -436,6 +436,8 @@ static void pass1(FILE *fil, struct device *ptr)
    	fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore);
    	if (ptr->chip->chip == &mainboard)
    		fprintf(fil, "\t.name = mainboard_name,\n");
+		else
+			fprintf(fil, "\t.name = %s_name,\n", ptr->chip->name_underscore);
    	fprintf(fil, "#endif\n");
    	if (ptr->chip->chiph_exists)
    		fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id);
@@ -642,6 +644,7 @@ int main(int argc, char** argv) {
    	while (h->next) {
    		h = h->next;
    		char *name_underscore = translate_name(h->name, UNSLASH);
+			fprintf(autogen, "__attribute__((weak)) const char %s_name[] = "(unknown)";\n", name_underscore);
    		fprintf(autogen, "__attribute__((weak)) struct chip_operations %s_ops = {};\n", name_underscore);
    		free(name_underscore);
    	}