Auto-declare chip_operations

The name is derived directly from the device path.

Change-Id: If2053d14f0e38a5ee0159b47a66d45ff3dff649a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/1471
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>

179 files changed, 8 insertions, 326 deletions

diff --git a/src/cpu/amd/agesa/family10/chip.h b/src/cpu/amd/agesa/family10/chip.h
index d5a749b3c6..4f9fa770bf 100644
--- a/src/cpu/amd/agesa/family10/chip.h
+++ b/src/cpu/amd/agesa/family10/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_family10_ops;
-
 struct cpu_amd_agesa_family10_config {
 };
diff --git a/src/cpu/amd/agesa/family12/chip.h b/src/cpu/amd/agesa/family12/chip.h
index f63a87f5d9..0eaa0e2789 100644
--- a/src/cpu/amd/agesa/family12/chip.h
+++ b/src/cpu/amd/agesa/family12/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_family12_ops;
-
 struct cpu_amd_agesa_family12_config {
 };
diff --git a/src/cpu/amd/agesa/family14/chip.h b/src/cpu/amd/agesa/family14/chip.h
index d67184e306..59c7cfeb67 100644
--- a/src/cpu/amd/agesa/family14/chip.h
+++ b/src/cpu/amd/agesa/family14/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_family14_ops;
-
 struct cpu_amd_agesa_family14_config {
 };
diff --git a/src/cpu/amd/agesa/family15/chip.h b/src/cpu/amd/agesa/family15/chip.h
index 0171e7fcd0..e6daaefd58 100644
--- a/src/cpu/amd/agesa/family15/chip.h
+++ b/src/cpu/amd/agesa/family15/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_family15_ops;
-
 struct cpu_amd_agesa_family15_config {
 };
diff --git a/src/cpu/amd/agesa/family15tn/chip.h b/src/cpu/amd/agesa/family15tn/chip.h
index cf8294f161..5ad93c5e0c 100644
--- a/src/cpu/amd/agesa/family15tn/chip.h
+++ b/src/cpu/amd/agesa/family15tn/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_family15tn_ops;
-
 struct cpu_amd_agesa_family15tn_config {
 };
diff --git a/src/cpu/amd/sc520/chip.h b/src/cpu/amd/sc520/chip.h
index b16db54a5a..64f3a85afc 100644
--- a/src/cpu/amd/sc520/chip.h
+++ b/src/cpu/amd/sc520/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_sc520_ops;
-
 struct cpu_amd_sc520_config {
 };
diff --git a/src/cpu/amd/socket_754/chip.h b/src/cpu/amd/socket_754/chip.h
index d9f3600b2c..197145faf6 100644
--- a/src/cpu/amd/socket_754/chip.h
+++ b/src/cpu/amd/socket_754/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_754_ops;
-
 struct cpu_amd_socket_754_config {
 };
diff --git a/src/cpu/amd/socket_939/chip.h b/src/cpu/amd/socket_939/chip.h
index 2a635b7477..ca934512b2 100644
--- a/src/cpu/amd/socket_939/chip.h
+++ b/src/cpu/amd/socket_939/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_939_ops;
-
 struct cpu_amd_socket_939_config {
 };
diff --git a/src/cpu/amd/socket_940/chip.h b/src/cpu/amd/socket_940/chip.h
index 7154dd1593..8b966141b5 100644
--- a/src/cpu/amd/socket_940/chip.h
+++ b/src/cpu/amd/socket_940/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_940_ops;
-
 struct cpu_amd_socket_940_config {
 };
diff --git a/src/cpu/amd/socket_AM2/chip.h b/src/cpu/amd/socket_AM2/chip.h
index 6b3290c90e..5d9e875320 100644
--- a/src/cpu/amd/socket_AM2/chip.h
+++ b/src/cpu/amd/socket_AM2/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_AM2_ops;
-
 struct cpu_amd_socket_AM2_config {
 };
diff --git a/src/cpu/amd/socket_AM2r2/chip.h b/src/cpu/amd/socket_AM2r2/chip.h
index fe49ad2851..1c93a99bd5 100644
--- a/src/cpu/amd/socket_AM2r2/chip.h
+++ b/src/cpu/amd/socket_AM2r2/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_socket_AM2r2_ops;
-
 struct cpu_amd_socket_AM2r2_config {
 };
diff --git a/src/cpu/amd/socket_AM3/chip.h b/src/cpu/amd/socket_AM3/chip.h
index 16e0935225..70f6b1fcbb 100644
--- a/src/cpu/amd/socket_AM3/chip.h
+++ b/src/cpu/amd/socket_AM3/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_socket_AM3_ops;
-
 struct cpu_amd_socket_AM3_config {
 };
diff --git a/src/cpu/amd/socket_ASB2/chip.h b/src/cpu/amd/socket_ASB2/chip.h
index 3a53696630..5939c2b71d 100644
--- a/src/cpu/amd/socket_ASB2/chip.h
+++ b/src/cpu/amd/socket_ASB2/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_socket_ASB2_ops;
-
 struct cpu_amd_socket_ASB2_config {
 };
diff --git a/src/cpu/amd/socket_C32/chip.h b/src/cpu/amd/socket_C32/chip.h
index 0e06de56e7..e9d57c7a7a 100644
--- a/src/cpu/amd/socket_C32/chip.h
+++ b/src/cpu/amd/socket_C32/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_socket_C32_ops;
-
 struct cpu_amd_socket_C32_config {
 };
diff --git a/src/cpu/amd/socket_F/chip.h b/src/cpu/amd/socket_F/chip.h
index ce2fde0bff..cb582d3f61 100644
--- a/src/cpu/amd/socket_F/chip.h
+++ b/src/cpu/amd/socket_F/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_F_ops;
-
 struct cpu_amd_socket_F_config {
 };
diff --git a/src/cpu/amd/socket_F_1207/chip.h b/src/cpu/amd/socket_F_1207/chip.h
index 95b13e237d..3f7d8242e3 100644
--- a/src/cpu/amd/socket_F_1207/chip.h
+++ b/src/cpu/amd/socket_F_1207/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_socket_F_1207_ops;
-
 struct cpu_amd_socket_F_1207_config {
 };
diff --git a/src/cpu/amd/socket_S1G1/chip.h b/src/cpu/amd/socket_S1G1/chip.h
index 826c7067a9..3109da265e 100644
--- a/src/cpu/amd/socket_S1G1/chip.h
+++ b/src/cpu/amd/socket_S1G1/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_amd_socket_S1G1_ops;
-
 struct cpu_amd_socket_S1G1_config {
 };
diff --git a/src/cpu/intel/ep80579/chip.h b/src/cpu/intel/ep80579/chip.h
index 6383c86bae..08e752916d 100644
--- a/src/cpu/intel/ep80579/chip.h
+++ b/src/cpu/intel/ep80579/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_intel_ep80579_ops;
-
 struct cpu_intel_ep80579_config {
 };
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h
index 96b4c5d9a9..85cbe1b0f0 100644
--- a/src/cpu/intel/model_206ax/chip.h
+++ b/src/cpu/intel/model_206ax/chip.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_intel_model_206ax_ops;
-
 /* Magic value used to locate this chip in the device tree */
 #define SPEEDSTEP_APIC_MAGIC 0xACAC
 
diff --git a/src/cpu/intel/slot_1/chip.h b/src/cpu/intel/slot_1/chip.h
index 6721d6ee8b..8650f90a7c 100644
--- a/src/cpu/intel/slot_1/chip.h
+++ b/src/cpu/intel/slot_1/chip.h
@@ -18,7 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_intel_slot_1_ops;
-
 struct cpu_intel_slot_1_config {
 };
diff --git a/src/cpu/intel/slot_2/chip.h b/src/cpu/intel/slot_2/chip.h
index 0f504dbc5f..d7bb2b1764 100644
--- a/src/cpu/intel/slot_2/chip.h
+++ b/src/cpu/intel/slot_2/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_slot_2_ops;
-
 struct cpu_intel_slot_2_config {
 };
diff --git a/src/cpu/intel/socket_441/chip.h b/src/cpu/intel/socket_441/chip.h
index 264dafa9bf..70c4ac8c64 100644
--- a/src/cpu/intel/socket_441/chip.h
+++ b/src/cpu/intel/socket_441/chip.h
@@ -17,7 +17,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_intel_socket_441_ops;
-
 struct cpu_intel_socket_441_config {
 };
diff --git a/src/cpu/intel/socket_BGA956/chip.h b/src/cpu/intel/socket_BGA956/chip.h
index 68ec1d2dc8..399200dc51 100644
--- a/src/cpu/intel/socket_BGA956/chip.h
+++ b/src/cpu/intel/socket_BGA956/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_BGA956_ops;
-
 struct cpu_intel_socket_BGA956_config {
 };
diff --git a/src/cpu/intel/socket_FC_PGA370/chip.h b/src/cpu/intel/socket_FC_PGA370/chip.h
index c1195c2fd5..7148d4761f 100644
--- a/src/cpu/intel/socket_FC_PGA370/chip.h
+++ b/src/cpu/intel/socket_FC_PGA370/chip.h
@@ -18,7 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_intel_socket_FC_PGA370_ops;
-
 struct cpu_intel_socket_FC_PGA370_config {
 };
diff --git a/src/cpu/intel/socket_LGA771/chip.h b/src/cpu/intel/socket_LGA771/chip.h
index d3f312ea85..fc51d777cf 100644
--- a/src/cpu/intel/socket_LGA771/chip.h
+++ b/src/cpu/intel/socket_LGA771/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_LGA771_ops;
-
 struct cpu_intel_socket_LGA771_config {
 };
diff --git a/src/cpu/intel/socket_PGA370/chip.h b/src/cpu/intel/socket_PGA370/chip.h
index 469b662dfb..c2c70ec4ad 100644
--- a/src/cpu/intel/socket_PGA370/chip.h
+++ b/src/cpu/intel/socket_PGA370/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_PGA370_ops;
-
 struct cpu_intel_socket_PGA370_config {
 };
diff --git a/src/cpu/intel/socket_mFCBGA479/chip.h b/src/cpu/intel/socket_mFCBGA479/chip.h
index 9dee4a9e46..57e432c615 100644
--- a/src/cpu/intel/socket_mFCBGA479/chip.h
+++ b/src/cpu/intel/socket_mFCBGA479/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mFCBGA479_ops;
-
 struct cpu_intel_socket_mFCBGA479_config {
 };
diff --git a/src/cpu/intel/socket_mFCPGA478/chip.h b/src/cpu/intel/socket_mFCPGA478/chip.h
index b747698d6e..50268f5705 100644
--- a/src/cpu/intel/socket_mFCPGA478/chip.h
+++ b/src/cpu/intel/socket_mFCPGA478/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mFCPGA478_ops;
-
 struct cpu_intel_socket_mFCPGA478_config {
 };
diff --git a/src/cpu/intel/socket_mPGA478/chip.h b/src/cpu/intel/socket_mPGA478/chip.h
index 8cc29b1726..3dafc9ae3e 100644
--- a/src/cpu/intel/socket_mPGA478/chip.h
+++ b/src/cpu/intel/socket_mPGA478/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mPGA478_ops;
-
 struct cpu_intel_socket_mPGA478_config {
 };
diff --git a/src/cpu/intel/socket_mPGA479M/chip.h b/src/cpu/intel/socket_mPGA479M/chip.h
index 57e9bd5bcb..c0c5cd4d6d 100644
--- a/src/cpu/intel/socket_mPGA479M/chip.h
+++ b/src/cpu/intel/socket_mPGA479M/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mPGA479M_ops;
-
 struct cpu_intel_socket_mPGA479M_config {
 };
diff --git a/src/cpu/intel/socket_mPGA603/chip.h b/src/cpu/intel/socket_mPGA603/chip.h
index 0170297e68..b39982ab1f 100644
--- a/src/cpu/intel/socket_mPGA603/chip.h
+++ b/src/cpu/intel/socket_mPGA603/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mPGA603_ops;
-
 struct cpu_intel_socket_mPGA603_config {
 };
diff --git a/src/cpu/intel/socket_mPGA604/chip.h b/src/cpu/intel/socket_mPGA604/chip.h
index 636d797bb3..3a09b82b8b 100644
--- a/src/cpu/intel/socket_mPGA604/chip.h
+++ b/src/cpu/intel/socket_mPGA604/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_mPGA604_ops;
-
 struct cpu_intel_socket_mPGA604_config {
 };
diff --git a/src/cpu/intel/socket_rPGA989/chip.h b/src/cpu/intel/socket_rPGA989/chip.h
index f843e74738..ee3b396a1e 100644
--- a/src/cpu/intel/socket_rPGA989/chip.h
+++ b/src/cpu/intel/socket_rPGA989/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations cpu_intel_socket_rPGA989_ops;
-
 struct cpu_intel_socket_rPGA989_config {
 };
diff --git a/src/drivers/generic/debug/chip.h b/src/drivers/generic/debug/chip.h
index 78ce2159a1..661fd54d7c 100644
--- a/src/drivers/generic/debug/chip.h
+++ b/src/drivers/generic/debug/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_generic_debug_ops;
-
 struct drivers_generic_debug_config {
 };
diff --git a/src/drivers/generic/ioapic/chip.h b/src/drivers/generic/ioapic/chip.h
index f6b298f077..ad6ff0ba1f 100644
--- a/src/drivers/generic/ioapic/chip.h
+++ b/src/drivers/generic/ioapic/chip.h
@@ -20,7 +20,6 @@
 #ifndef DRIVERS_GENERIC_IOAPIC_CHIP_H
 #define DRIVERS_GENERIC_IOAPIC_CHIP_H
 
-extern struct chip_operations drivers_generic_ioapic_ops;
 struct drivers_generic_ioapic_config {
 	u32 version;
 	u8 apicid;
diff --git a/src/drivers/i2c/adm1026/chip.h b/src/drivers/i2c/adm1026/chip.h
index 4ccca764fb..f8324ad797 100644
--- a/src/drivers/i2c/adm1026/chip.h
+++ b/src/drivers/i2c/adm1026/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_adm1026_ops;
-
 struct drivers_i2c_adm1026_config {
 };
diff --git a/src/drivers/i2c/adm1027/chip.h b/src/drivers/i2c/adm1027/chip.h
index 94c4e888e9..8836817c36 100644
--- a/src/drivers/i2c/adm1027/chip.h
+++ b/src/drivers/i2c/adm1027/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_adm1027_ops;
-
 struct drivers_i2c_adm1027_config {
 };
diff --git a/src/drivers/i2c/adt7463/chip.h b/src/drivers/i2c/adt7463/chip.h
index fdb22b95c8..351d548029 100644
--- a/src/drivers/i2c/adt7463/chip.h
+++ b/src/drivers/i2c/adt7463/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_adt7463_ops;
-
 struct drivers_i2c_adt7463_config {
 };
diff --git a/src/drivers/i2c/i2cmux/chip.h b/src/drivers/i2c/i2cmux/chip.h
index ffaf87954a..0cfd837755 100644
--- a/src/drivers/i2c/i2cmux/chip.h
+++ b/src/drivers/i2c/i2cmux/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_i2cmux_ops;
-
 struct drivers_i2c_i2cmux_config {
 };
diff --git a/src/drivers/i2c/i2cmux2/chip.h b/src/drivers/i2c/i2cmux2/chip.h
index f6fd35f796..dafa1d71ad 100644
--- a/src/drivers/i2c/i2cmux2/chip.h
+++ b/src/drivers/i2c/i2cmux2/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_i2cmux2_ops;
-
 struct drivers_i2c_i2cmux2_config {
 };
diff --git a/src/drivers/i2c/lm63/chip.h b/src/drivers/i2c/lm63/chip.h
index 5c558464f3..1c5bc7a33a 100644
--- a/src/drivers/i2c/lm63/chip.h
+++ b/src/drivers/i2c/lm63/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_lm63_ops;
-
 struct drivers_i2c_lm63_config {
 };
diff --git a/src/drivers/i2c/w83793/chip.h b/src/drivers/i2c/w83793/chip.h
index dc3cd7500f..65a50bb32f 100644
--- a/src/drivers/i2c/w83793/chip.h
+++ b/src/drivers/i2c/w83793/chip.h
@@ -1,5 +1,3 @@
-extern struct chip_operations drivers_i2c_w83793_ops;
-
 struct drivers_i2c_w83793_config {
 	u8 mfc;
 	u8 fanin;
diff --git a/src/drivers/i2c/w83795/chip.h b/src/drivers/i2c/w83795/chip.h
index 290063682f..b5162c1344 100644
--- a/src/drivers/i2c/w83795/chip.h
+++ b/src/drivers/i2c/w83795/chip.h
@@ -1,4 +1,2 @@
-extern struct chip_operations drivers_i2c_w83795_ops;
-
 struct drivers_i2c_w83795_config {
 };
diff --git a/src/drivers/ics/954309/chip.h b/src/drivers/ics/954309/chip.h
index 8dfc3e06dd..66cc2c636f 100644
--- a/src/drivers/ics/954309/chip.h
+++ b/src/drivers/ics/954309/chip.h
@@ -19,8 +19,6 @@
  * MA 02110-1301 USA
  */
 
-extern struct chip_operations drivers_ics_954309_ops;
-
 struct drivers_ics_954309_config {
 	u8 reg0;
 	u8 reg1;
diff --git a/src/ec/lenovo/h8/chip.h b/src/ec/lenovo/h8/chip.h
index 3a75f3bb84..1b14aa9b29 100644
--- a/src/ec/lenovo/h8/chip.h
+++ b/src/ec/lenovo/h8/chip.h
@@ -20,7 +20,6 @@
 #ifndef EC_LENOVO_H8EC_CHIP_H
 #define EC_LENOVO_H8EC_CHIP_H
 
-extern struct chip_operations ec_lenovo_h8_ops;
 struct ec_lenovo_h8_config {
 
 	u8 config0;
diff --git a/src/ec/lenovo/pmh7/chip.h b/src/ec/lenovo/pmh7/chip.h
index 725a5d5c74..c7e1de6808 100644
--- a/src/ec/lenovo/pmh7/chip.h
+++ b/src/ec/lenovo/pmh7/chip.h
@@ -20,8 +20,6 @@
 #ifndef EC_LENOVO_PMH7_CHIP_H
 #define EC_LENOVO_PMH7_CHIP_H
 
-extern struct chip_operations ec_lenovo_pmh7_ops;
-
 struct ec_lenovo_pmh7_config {
 	int backlight_enable:1;
 	int dock_event_enable:1;
diff --git a/src/ec/smsc/mec1308/chip.h b/src/ec/smsc/mec1308/chip.h
index 3a8eae8f8a..1768185184 100644
--- a/src/ec/smsc/mec1308/chip.h
+++ b/src/ec/smsc/mec1308/chip.h
@@ -27,7 +27,4 @@ struct ec_smsc_mec1308_config
 	u16 mailbox_port;
 };
 
-struct chip_operations;
-extern struct chip_operations ec_smsc_mec1308_ops;
-
 #endif /* _EC_SMSC_MEC1308_CHIP_H */
diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
index ff9301f418..0aa8173a8b 100644
--- a/src/mainboard/emulation/qemu-x86/chip.h
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -1,4 +1,2 @@
 struct mainboard_emulation_qemu_x86_config {};
 
-extern struct chip_operations mainboard_emulation_qemu_x86_ops;
-
diff --git a/src/northbridge/amd/agesa/family10/chip.h b/src/northbridge/amd/agesa/family10/chip.h
index c0ac56e5a9..f95d5b1170 100644
--- a/src/northbridge/amd/agesa/family10/chip.h
+++ b/src/northbridge/amd/agesa/family10/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family10_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family10_ops;
diff --git a/src/northbridge/amd/agesa/family10/root_complex/chip.h b/src/northbridge/amd/agesa/family10/root_complex/chip.h
index 15a2e1ae69..80adb8eb71 100644
--- a/src/northbridge/amd/agesa/family10/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family10/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family10_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family10_root_complex_ops;
diff --git a/src/northbridge/amd/agesa/family12/chip.h b/src/northbridge/amd/agesa/family12/chip.h
index 462610d6ea..39efd523d6 100644
--- a/src/northbridge/amd/agesa/family12/chip.h
+++ b/src/northbridge/amd/agesa/family12/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family12_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family12_ops;
diff --git a/src/northbridge/amd/agesa/family12/root_complex/chip.h b/src/northbridge/amd/agesa/family12/root_complex/chip.h
index 91599252fc..556f343ad5 100644
--- a/src/northbridge/amd/agesa/family12/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family12/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family12_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family12_root_complex_ops;
diff --git a/src/northbridge/amd/agesa/family14/chip.h b/src/northbridge/amd/agesa/family14/chip.h
index 26a1aad6bb..46ea78a64a 100644
--- a/src/northbridge/amd/agesa/family14/chip.h
+++ b/src/northbridge/amd/agesa/family14/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family14_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family14_ops;
diff --git a/src/northbridge/amd/agesa/family14/root_complex/chip.h b/src/northbridge/amd/agesa/family14/root_complex/chip.h
index 234f931aef..cf95179073 100644
--- a/src/northbridge/amd/agesa/family14/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family14/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family14_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family14_root_complex_ops;
diff --git a/src/northbridge/amd/agesa/family15/chip.h b/src/northbridge/amd/agesa/family15/chip.h
index cec1fc4ad1..b06318b980 100644
--- a/src/northbridge/amd/agesa/family15/chip.h
+++ b/src/northbridge/amd/agesa/family15/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family15_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family15_ops;
diff --git a/src/northbridge/amd/agesa/family15/root_complex/chip.h b/src/northbridge/amd/agesa/family15/root_complex/chip.h
index 06b3510705..8f670f6b94 100644
--- a/src/northbridge/amd/agesa/family15/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family15/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family15_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family15_root_complex_ops;
diff --git a/src/northbridge/amd/agesa/family15tn/chip.h b/src/northbridge/amd/agesa/family15tn/chip.h
index d8361719e1..091de82f6d 100644
--- a/src/northbridge/amd/agesa/family15tn/chip.h
+++ b/src/northbridge/amd/agesa/family15tn/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family15tn_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family15tn_ops;
diff --git a/src/northbridge/amd/agesa/family15tn/root_complex/chip.h b/src/northbridge/amd/agesa/family15tn/root_complex/chip.h
index 802bb95cf6..0306fdd08b 100644
--- a/src/northbridge/amd/agesa/family15tn/root_complex/chip.h
+++ b/src/northbridge/amd/agesa/family15tn/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_agesa_family15tn_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_agesa_family15tn_root_complex_ops;
diff --git a/src/northbridge/amd/amdfam10/chip.h b/src/northbridge/amd/amdfam10/chip.h
index e055475780..a8161cbb35 100644
--- a/src/northbridge/amd/amdfam10/chip.h
+++ b/src/northbridge/amd/amdfam10/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_amdfam10_config
 {
 };
 
-extern struct chip_operations northbridge_amd_amdfam10_ops;
diff --git a/src/northbridge/amd/amdfam10/root_complex/chip.h b/src/northbridge/amd/amdfam10/root_complex/chip.h
index ed42c0f368..8c93020f7b 100644
--- a/src/northbridge/amd/amdfam10/root_complex/chip.h
+++ b/src/northbridge/amd/amdfam10/root_complex/chip.h
@@ -21,4 +21,3 @@ struct northbridge_amd_amdfam10_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_amdfam10_root_complex_ops;
diff --git a/src/northbridge/amd/amdk8/chip.h b/src/northbridge/amd/amdk8/chip.h
index 26d4e53ac6..a2331f41a2 100644
--- a/src/northbridge/amd/amdk8/chip.h
+++ b/src/northbridge/amd/amdk8/chip.h
@@ -2,4 +2,3 @@ struct northbridge_amd_amdk8_config
 {
 };
 
-extern struct chip_operations northbridge_amd_amdk8_ops;
diff --git a/src/northbridge/amd/amdk8/root_complex/chip.h b/src/northbridge/amd/amdk8/root_complex/chip.h
index 0b49ca8ae9..a9b6b5b2cd 100644
--- a/src/northbridge/amd/amdk8/root_complex/chip.h
+++ b/src/northbridge/amd/amdk8/root_complex/chip.h
@@ -2,4 +2,3 @@ struct northbridge_amd_amdk8_root_complex_config
 {
 };
 
-extern struct chip_operations northbridge_amd_amdk8_root_complex_ops;
diff --git a/src/northbridge/amd/cimx/rd890/chip.h b/src/northbridge/amd/cimx/rd890/chip.h
index c2f985bacc..ccc979f4ea 100644
--- a/src/northbridge/amd/cimx/rd890/chip.h
+++ b/src/northbridge/amd/cimx/rd890/chip.h
@@ -17,12 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
 #ifndef _CIMX_RD890_CHIP_H_
 #define _CIMX_RD890_CHIP_H_
 
-extern struct chip_operations northbridge_amd_cimx_rd890_ops;
-
 /**
  * RD890 specific device configuration
  */
diff --git a/src/northbridge/amd/gx1/chip.h b/src/northbridge/amd/gx1/chip.h
index 00374568bb..0378b61f2e 100644
--- a/src/northbridge/amd/gx1/chip.h
+++ b/src/northbridge/amd/gx1/chip.h
@@ -2,4 +2,3 @@ struct northbridge_amd_gx1_config
 {
 };
 
-extern struct chip_operations northbridge_amd_gx1_ops;
diff --git a/src/northbridge/amd/gx2/chip.h b/src/northbridge/amd/gx2/chip.h
index 34021ba4d5..1e266c6dc5 100644
--- a/src/northbridge/amd/gx2/chip.h
+++ b/src/northbridge/amd/gx2/chip.h
@@ -22,4 +22,3 @@ struct northbridge_amd_gx2_config
 
 };
 
-extern struct chip_operations northbridge_amd_gx2_ops;
diff --git a/src/northbridge/amd/lx/chip.h b/src/northbridge/amd/lx/chip.h
index 94ef6c5599..12b50fbecf 100644
--- a/src/northbridge/amd/lx/chip.h
+++ b/src/northbridge/amd/lx/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_amd_lx_config {
 };
 
-extern struct chip_operations northbridge_amd_lx_ops;
diff --git a/src/northbridge/intel/e7501/chip.h b/src/northbridge/intel/e7501/chip.h
index 458510bc9e..112c03cdc4 100644
--- a/src/northbridge/intel/e7501/chip.h
+++ b/src/northbridge/intel/e7501/chip.h
@@ -2,4 +2,3 @@ struct northbridge_intel_e7501_config
 {
 };
 
-extern struct chip_operations northbridge_intel_e7501_ops;
diff --git a/src/northbridge/intel/e7505/chip.h b/src/northbridge/intel/e7505/chip.h
index 9677dca044..8fd3cdcfb0 100644
--- a/src/northbridge/intel/e7505/chip.h
+++ b/src/northbridge/intel/e7505/chip.h
@@ -2,5 +2,3 @@ struct northbridge_intel_e7505_config
 {
 };
 
-extern struct chip_operations northbridge_intel_e7505_ops;
-
diff --git a/src/northbridge/intel/e7520/chip.h b/src/northbridge/intel/e7520/chip.h
index b02b8b8ad7..99833bd4a4 100644
--- a/src/northbridge/intel/e7520/chip.h
+++ b/src/northbridge/intel/e7520/chip.h
@@ -4,4 +4,3 @@ struct northbridge_intel_e7520_config
         unsigned int intrline;
 };
 
-extern struct chip_operations northbridge_intel_e7520_ops;
diff --git a/src/northbridge/intel/e7525/chip.h b/src/northbridge/intel/e7525/chip.h
index 7daadefefe..c7783d40c1 100644
--- a/src/northbridge/intel/e7525/chip.h
+++ b/src/northbridge/intel/e7525/chip.h
@@ -4,4 +4,3 @@ struct northbridge_intel_e7525_config
         unsigned int intrline;
 };
 
-extern struct chip_operations northbridge_intel_e7525_ops;
diff --git a/src/northbridge/intel/i3100/chip.h b/src/northbridge/intel/i3100/chip.h
index 0ed31a48a8..76e81dde68 100644
--- a/src/northbridge/intel/i3100/chip.h
+++ b/src/northbridge/intel/i3100/chip.h
@@ -23,4 +23,3 @@ struct northbridge_intel_i3100_config
 	u16 intrline;
 };
 
-extern struct chip_operations northbridge_intel_i3100_ops;
diff --git a/src/northbridge/intel/i440bx/chip.h b/src/northbridge/intel/i440bx/chip.h
index a43a20cac1..15ecb4d735 100644
--- a/src/northbridge/intel/i440bx/chip.h
+++ b/src/northbridge/intel/i440bx/chip.h
@@ -22,4 +22,3 @@ struct northbridge_intel_i440bx_config
 {
 };
 
-extern struct chip_operations northbridge_intel_i440bx_ops;
diff --git a/src/northbridge/intel/i440lx/chip.h b/src/northbridge/intel/i440lx/chip.h
index 8d800f8cac..19a9b26980 100644
--- a/src/northbridge/intel/i440lx/chip.h
+++ b/src/northbridge/intel/i440lx/chip.h
@@ -22,4 +22,3 @@ struct northbridge_intel_i440lx_config
 {
 };
 
-extern struct chip_operations northbridge_intel_i440lx_ops;
diff --git a/src/northbridge/intel/i5000/chip.h b/src/northbridge/intel/i5000/chip.h
index a23be90df7..214ffcf23b 100644
--- a/src/northbridge/intel/i5000/chip.h
+++ b/src/northbridge/intel/i5000/chip.h
@@ -20,4 +20,3 @@
 struct northbridge_intel_i5000_config {
 };
 
-extern struct chip_operations northbridge_intel_i5000_ops;
diff --git a/src/northbridge/intel/i82810/chip.h b/src/northbridge/intel/i82810/chip.h
index f8c523e067..c57167756a 100644
--- a/src/northbridge/intel/i82810/chip.h
+++ b/src/northbridge/intel/i82810/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_intel_i82810_config {
 };
 
-extern struct chip_operations northbridge_intel_i82810_ops;
diff --git a/src/northbridge/intel/i82830/chip.h b/src/northbridge/intel/i82830/chip.h
index af398f5e23..d0360fe925 100644
--- a/src/northbridge/intel/i82830/chip.h
+++ b/src/northbridge/intel/i82830/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_intel_i82830_config {
 };
 
-extern struct chip_operations northbridge_intel_i82830_ops;
diff --git a/src/northbridge/intel/i855/chip.h b/src/northbridge/intel/i855/chip.h
index f98fe7b40a..40b1d38e1a 100644
--- a/src/northbridge/intel/i855/chip.h
+++ b/src/northbridge/intel/i855/chip.h
@@ -22,4 +22,3 @@ struct northbridge_intel_i855_config
 {
 };
 
-extern struct chip_operations northbridge_intel_i855_ops;
diff --git a/src/northbridge/intel/i945/chip.h b/src/northbridge/intel/i945/chip.h
index 6c51394d90..2deb985bb0 100644
--- a/src/northbridge/intel/i945/chip.h
+++ b/src/northbridge/intel/i945/chip.h
@@ -20,4 +20,3 @@
 struct northbridge_intel_i945_config {
 };
 
-extern struct chip_operations northbridge_intel_i945_ops;
diff --git a/src/northbridge/intel/sandybridge/chip.h b/src/northbridge/intel/sandybridge/chip.h
index bd89787463..05034f1a5a 100644
--- a/src/northbridge/intel/sandybridge/chip.h
+++ b/src/northbridge/intel/sandybridge/chip.h
@@ -40,4 +40,3 @@ struct northbridge_intel_sandybridge_config {
 	u32 gpu_pch_backlight;	/* PCH Backlight PWM value */
 };
 
-extern struct chip_operations northbridge_intel_sandybridge_ops;
diff --git a/src/northbridge/intel/sch/chip.h b/src/northbridge/intel/sch/chip.h
index 52c2b164c1..b3aebd35c8 100644
--- a/src/northbridge/intel/sch/chip.h
+++ b/src/northbridge/intel/sch/chip.h
@@ -20,4 +20,3 @@
 struct northbridge_intel_sch_config {
 };
 
-extern struct chip_operations northbridge_intel_sch_ops;
diff --git a/src/northbridge/rdc/r8610/chip.h b/src/northbridge/rdc/r8610/chip.h
index 01c835697f..150f032d69 100644
--- a/src/northbridge/rdc/r8610/chip.h
+++ b/src/northbridge/rdc/r8610/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_rdc_r8610_config {
 };
 
-extern struct chip_operations northbridge_rdc_r8610_ops;
diff --git a/src/northbridge/via/cn400/chip.h b/src/northbridge/via/cn400/chip.h
index cc3f7c0de8..e403d352c0 100644
--- a/src/northbridge/via/cn400/chip.h
+++ b/src/northbridge/via/cn400/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_via_cn400_config {
 };
 
-extern struct chip_operations northbridge_via_cn400_ops;
diff --git a/src/northbridge/via/cn700/chip.h b/src/northbridge/via/cn700/chip.h
index e5534968d7..5b1515dc8f 100644
--- a/src/northbridge/via/cn700/chip.h
+++ b/src/northbridge/via/cn700/chip.h
@@ -21,4 +21,3 @@
 struct northbridge_via_cn700_config {
 };
 
-extern struct chip_operations northbridge_via_cn700_ops;
diff --git a/src/northbridge/via/cx700/chip.h b/src/northbridge/via/cx700/chip.h
index 7b7aca8e89..0e8491bbb4 100644
--- a/src/northbridge/via/cx700/chip.h
+++ b/src/northbridge/via/cx700/chip.h
@@ -20,4 +20,3 @@
 struct northbridge_via_cx700_config {
 };
 
-extern struct chip_operations northbridge_via_cx700_ops;
diff --git a/src/northbridge/via/vt8601/chip.h b/src/northbridge/via/vt8601/chip.h
index 9f61465428..c65e12e54c 100644
--- a/src/northbridge/via/vt8601/chip.h
+++ b/src/northbridge/via/vt8601/chip.h
@@ -2,4 +2,3 @@ struct northbridge_via_vt8601_config
 {
 };
 
-extern struct chip_operations northbridge_via_vt8601_ops;
diff --git a/src/northbridge/via/vt8623/chip.h b/src/northbridge/via/vt8623/chip.h
index 6b0aa9695e..5fb3f80999 100644
--- a/src/northbridge/via/vt8623/chip.h
+++ b/src/northbridge/via/vt8623/chip.h
@@ -2,4 +2,3 @@ struct northbridge_via_vt8623_config
 {
 };
 
-extern struct chip_operations northbridge_via_vt8623_ops;
diff --git a/src/northbridge/via/vx800/chip.h b/src/northbridge/via/vx800/chip.h
index 7d7153ceda..64df31af51 100644
--- a/src/northbridge/via/vx800/chip.h
+++ b/src/northbridge/via/vx800/chip.h
@@ -20,4 +20,3 @@
 struct northbridge_via_vx800_config {
 };
 
-extern struct chip_operations northbridge_via_vx800_ops;
diff --git a/src/southbridge/amd/agesa/hudson/chip.h b/src/southbridge/amd/agesa/hudson/chip.h
index 7732f6d2fe..1970608978 100644
--- a/src/southbridge/amd/agesa/hudson/chip.h
+++ b/src/southbridge/amd/agesa/hudson/chip.h
@@ -30,7 +30,5 @@ struct southbridge_amd_agesa_hudson_config
 	u8  gpp_configuration;
 	#endif
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_agesa_hudson_ops;
 
 #endif /* HUDSON_CHIP_H */
diff --git a/src/southbridge/amd/amd8111/chip.h b/src/southbridge/amd/amd8111/chip.h
index 601038c441..622bf10fb7 100644
--- a/src/southbridge/amd/amd8111/chip.h
+++ b/src/southbridge/amd/amd8111/chip.h
@@ -8,7 +8,4 @@ struct southbridge_amd_amd8111_config
 	unsigned int phy_lowreset : 1;
 };
 
-struct chip_operations;
-extern struct chip_operations southbridge_amd_amd8111_ops;
-
 #endif /* AMD8111_CHIP_H */
diff --git a/src/southbridge/amd/cimx/sb700/chip.h b/src/southbridge/amd/cimx/sb700/chip.h
index ef294f450c..05edc5c288 100644
--- a/src/southbridge/amd/cimx/sb700/chip.h
+++ b/src/southbridge/amd/cimx/sb700/chip.h
@@ -20,8 +20,6 @@
 #ifndef _CIMX_SB700_CHIP_H_
 #define _CIMX_SB700_CHIP_H_
 
-extern struct chip_operations southbridge_amd_cimx_sb700_ops;
-
 /*
  * configuration set in mainboard/devicetree.cb
  *  boot_switch_sata_ide:
diff --git a/src/southbridge/amd/cimx/sb800/chip.h b/src/southbridge/amd/cimx/sb800/chip.h
index 3581f2e3b0..7fc7b88c76 100644
--- a/src/southbridge/amd/cimx/sb800/chip.h
+++ b/src/southbridge/amd/cimx/sb800/chip.h
@@ -20,8 +20,6 @@
 #ifndef _CIMX_SB800_CHIP_H_
 #define _CIMX_SB800_CHIP_H_
 
-extern struct chip_operations southbridge_amd_cimx_sb800_ops;
-
 /*
  * configuration set in mainboard/devicetree.cb
  *  boot_switch_sata_ide:
diff --git a/src/southbridge/amd/cimx/sb900/chip.h b/src/southbridge/amd/cimx/sb900/chip.h
index 96afc42736..9004969b85 100644
--- a/src/southbridge/amd/cimx/sb900/chip.h
+++ b/src/southbridge/amd/cimx/sb900/chip.h
@@ -20,8 +20,6 @@
 #ifndef _CIMX_SB900_CHIP_H_
 #define _CIMX_SB900_CHIP_H_
 
-extern struct chip_operations southbridge_amd_cimx_sb900_ops;
-
 /*
  * configuration set in mainboard/devicetree.cb
  *  boot_switch_sata_ide:
diff --git a/src/southbridge/amd/cs5530/chip.h b/src/southbridge/amd/cs5530/chip.h
index 92d64e49f9..271facb147 100644
--- a/src/southbridge/amd/cs5530/chip.h
+++ b/src/southbridge/amd/cs5530/chip.h
@@ -21,8 +21,6 @@
 #ifndef SOUTHBRIDGE_AMD_CS5530_CHIP_H
 #define SOUTHBRIDGE_AMD_CS5530_CHIP_H
 
-extern struct chip_operations southbridge_amd_cs5530_ops;
-
 struct southbridge_amd_cs5530_config {
 	int ide0_enable:1;
 	int ide1_enable:1;
diff --git a/src/southbridge/amd/cs5535/chip.h b/src/southbridge/amd/cs5535/chip.h
index 3894a06906..d4dde3d6ee 100644
--- a/src/southbridge/amd/cs5535/chip.h
+++ b/src/southbridge/amd/cs5535/chip.h
@@ -1,8 +1,6 @@
 #ifndef _SOUTHBRIDGE_AMD_CS5535
 #define _SOUTHBRIDGE_AMD_CS5535
 
-extern struct chip_operations southbridge_amd_cs5535_ops;
-
 struct southbridge_amd_cs5535_config {
 	int setupflash;
 };
diff --git a/src/southbridge/amd/cs5536/chip.h b/src/southbridge/amd/cs5536/chip.h
index ad9e736dec..69deadc70b 100644
--- a/src/southbridge/amd/cs5536/chip.h
+++ b/src/southbridge/amd/cs5536/chip.h
@@ -23,8 +23,6 @@
 
 #define MAX_UNWANTED_VPCI 8	/* increase if needed */
 
-extern struct chip_operations southbridge_amd_cs5536_ops;
-
 struct southbridge_amd_cs5536_config {
 	unsigned int lpc_serirq_enable;	/* interrupt enables for LPC bus; each bit is an irq 0-15 */
 	unsigned int lpc_serirq_polarity;	/* LPC IRQ polarity; each bit is an irq 0-15 */
diff --git a/src/southbridge/amd/rs690/chip.h b/src/southbridge/amd/rs690/chip.h
index 5e08cc59f8..8ff4be5401 100644
--- a/src/southbridge/amd/rs690/chip.h
+++ b/src/southbridge/amd/rs690/chip.h
@@ -33,7 +33,5 @@ struct southbridge_amd_rs690_config
 	u8 gfx_reconfiguration;	/* Dynamic Lind Width Control */
 	u8 gfx_link_width;	/* Desired width of lane 2 */
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_rs690_ops;
 
 #endif /* RS690_CHIP_H */
diff --git a/src/southbridge/amd/rs780/chip.h b/src/southbridge/amd/rs780/chip.h
index 4a10ae0f8a..7afcbf2236 100644
--- a/src/southbridge/amd/rs780/chip.h
+++ b/src/southbridge/amd/rs780/chip.h
@@ -36,7 +36,5 @@ struct southbridge_amd_rs780_config
 	u8 gfx_pcie_config;		/* GFX PCIE Modes */
 	u8 gfx_ddi_config;		/* GFX DDI Modes */
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_rs780_ops;
 
 #endif /* RS780_CHIP_H */
diff --git a/src/southbridge/amd/sb600/chip.h b/src/southbridge/amd/sb600/chip.h
index ce40f18bf3..e288cbff89 100644
--- a/src/southbridge/amd/sb600/chip.h
+++ b/src/southbridge/amd/sb600/chip.h
@@ -24,7 +24,5 @@ struct southbridge_amd_sb600_config
 {
 	u32 hda_viddid;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_sb600_ops;
 
 #endif /* SB600_CHIP_H */
diff --git a/src/southbridge/amd/sb700/chip.h b/src/southbridge/amd/sb700/chip.h
index acdb2b712c..390c579e52 100644
--- a/src/southbridge/amd/sb700/chip.h
+++ b/src/southbridge/amd/sb700/chip.h
@@ -24,7 +24,5 @@ struct southbridge_amd_sb700_config
 {
 	u32 boot_switch_sata_ide : 1;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_sb700_ops;
 
 #endif /* SB700_CHIP_H */
diff --git a/src/southbridge/amd/sb800/chip.h b/src/southbridge/amd/sb800/chip.h
index 41f26d16c0..13e1aacd72 100644
--- a/src/southbridge/amd/sb800/chip.h
+++ b/src/southbridge/amd/sb800/chip.h
@@ -28,7 +28,5 @@ struct southbridge_amd_sb800_config
 	u32 hda_viddid;
 	u8  gpp_configuration;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_sb800_ops;
 
 #endif /* SB800_CHIP_H */
diff --git a/src/southbridge/amd/sr5650/chip.h b/src/southbridge/amd/sr5650/chip.h
index 43f8dd343c..236ac16b3e 100644
--- a/src/southbridge/amd/sr5650/chip.h
+++ b/src/southbridge/amd/sr5650/chip.h
@@ -28,7 +28,5 @@ struct southbridge_amd_sr5650_config
 	u8 gpp3a_configuration;		/* The configuration of General Purpose Port. */
 	u16 port_enable;		/* Which port is enabled? GPP(2,3,4,5,6,7,9,10,11,12,13) */
 };
-struct chip_operations;
-extern struct chip_operations southbridge_amd_sr5650_ops;
 
 #endif /* SR5650_CHIP_H */
diff --git a/src/southbridge/broadcom/bcm5785/chip.h b/src/southbridge/broadcom/bcm5785/chip.h
index eb337e9624..d323bee6c4 100644
--- a/src/southbridge/broadcom/bcm5785/chip.h
+++ b/src/southbridge/broadcom/bcm5785/chip.h
@@ -28,7 +28,5 @@ struct southbridge_broadcom_bcm5785_config
         unsigned int sata0_enable : 1;
         unsigned int sata1_enable : 1;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_broadcom_bcm5785_ops;
 
 #endif /* BCM5785_CHIP_H */
diff --git a/src/southbridge/intel/bd82x6x/chip.h b/src/southbridge/intel/bd82x6x/chip.h
index 07a2af7b9c..05eeab225d 100644
--- a/src/southbridge/intel/bd82x6x/chip.h
+++ b/src/southbridge/intel/bd82x6x/chip.h
@@ -79,6 +79,4 @@ struct southbridge_intel_bd82x6x_config {
 	uint8_t pcie_port_coalesce;
 };
 
-extern struct chip_operations southbridge_intel_bd82x6x_ops;
-
 #endif				/* SOUTHBRIDGE_INTEL_BD82X6X_CHIP_H */
diff --git a/src/southbridge/intel/esb6300/chip.h b/src/southbridge/intel/esb6300/chip.h
index 4082769cce..c6dc3a36ee 100644
--- a/src/southbridge/intel/esb6300/chip.h
+++ b/src/southbridge/intel/esb6300/chip.h
@@ -26,5 +26,4 @@ struct southbridge_intel_esb6300_config
 	unsigned int  pirq_a_d;
 	unsigned int  pirq_e_h;
 };
-extern struct chip_operations southbridge_intel_esb6300_ops;
 
diff --git a/src/southbridge/intel/i3100/chip.h b/src/southbridge/intel/i3100/chip.h
index 7e58674daf..21d3a46591 100644
--- a/src/southbridge/intel/i3100/chip.h
+++ b/src/southbridge/intel/i3100/chip.h
@@ -47,4 +47,3 @@ struct southbridge_intel_i3100_config
 	u32 pirq_a_d;
 	u32 pirq_e_h;
 };
-extern struct chip_operations southbridge_intel_i3100_ops;
diff --git a/src/southbridge/intel/i82371eb/chip.h b/src/southbridge/intel/i82371eb/chip.h
index 1cb2929346..80846930c5 100644
--- a/src/southbridge/intel/i82371eb/chip.h
+++ b/src/southbridge/intel/i82371eb/chip.h
@@ -23,8 +23,6 @@
 
 #include <device/device.h>
 
-extern const struct chip_operations southbridge_intel_i82371eb_ops;
-
 struct southbridge_intel_i82371eb_config {
 	int ide0_enable:1;
 	int ide0_drive0_udma33_enable:1;
diff --git a/src/southbridge/intel/i82801ax/chip.h b/src/southbridge/intel/i82801ax/chip.h
index 21b6f9fcf3..989f35b917 100644
--- a/src/southbridge/intel/i82801ax/chip.h
+++ b/src/southbridge/intel/i82801ax/chip.h
@@ -37,6 +37,4 @@ struct southbridge_intel_i82801ax_config {
 	u8 ide1_enable;
 };
 
-extern struct chip_operations southbridge_intel_i82801ax_ops;
-
 #endif
diff --git a/src/southbridge/intel/i82801bx/chip.h b/src/southbridge/intel/i82801bx/chip.h
index 5cdfc5da50..987eb8f8b2 100644
--- a/src/southbridge/intel/i82801bx/chip.h
+++ b/src/southbridge/intel/i82801bx/chip.h
@@ -41,6 +41,4 @@ struct southbridge_intel_i82801bx_config {
 	u8 ide1_enable;
 };
 
-extern struct chip_operations southbridge_intel_i82801bx_ops;
-
 #endif
diff --git a/src/southbridge/intel/i82801cx/chip.h b/src/southbridge/intel/i82801cx/chip.h
index 88415e0556..56185213eb 100644
--- a/src/southbridge/intel/i82801cx/chip.h
+++ b/src/southbridge/intel/i82801cx/chip.h
@@ -4,6 +4,5 @@
 struct southbridge_intel_i82801cx_config
 {
 };
-extern struct chip_operations southbridge_intel_i82801cx_ops;
 
 #endif /* I82801CX_CHIP_H */
diff --git a/src/southbridge/intel/i82801dx/chip.h b/src/southbridge/intel/i82801dx/chip.h
index 1209ec854b..42701f778f 100644
--- a/src/southbridge/intel/i82801dx/chip.h
+++ b/src/southbridge/intel/i82801dx/chip.h
@@ -41,6 +41,4 @@ struct southbridge_intel_i82801dx_config {
 	uint8_t ide1_enable;
 };
 
-extern struct chip_operations southbridge_intel_i82801dx_ops;
-
 #endif				/* I82801DBM_CHIP_H */
diff --git a/src/southbridge/intel/i82801ex/chip.h b/src/southbridge/intel/i82801ex/chip.h
index f04fc3fd29..891fa16d15 100644
--- a/src/southbridge/intel/i82801ex/chip.h
+++ b/src/southbridge/intel/i82801ex/chip.h
@@ -30,7 +30,6 @@ struct southbridge_intel_i82801ex_config
 	unsigned int  pirq_a_d;
 	unsigned int  pirq_e_h;
 };
-extern struct chip_operations southbridge_intel_i82801ex_ops;
 
 #endif /* I82801EX_CHIP_H */
 
diff --git a/src/southbridge/intel/i82801gx/chip.h b/src/southbridge/intel/i82801gx/chip.h
index cc17539d7d..5e4408aebf 100644
--- a/src/southbridge/intel/i82801gx/chip.h
+++ b/src/southbridge/intel/i82801gx/chip.h
@@ -73,6 +73,4 @@ struct southbridge_intel_i82801gx_config {
 	int c4onc3_enable:1;
 };
 
-extern struct chip_operations southbridge_intel_i82801gx_ops;
-
 #endif				/* SOUTHBRIDGE_INTEL_I82801GX_CHIP_H */
diff --git a/src/southbridge/intel/pxhd/chip.h b/src/southbridge/intel/pxhd/chip.h
index 5aedb77776..27d88a8277 100644
--- a/src/southbridge/intel/pxhd/chip.h
+++ b/src/southbridge/intel/pxhd/chip.h
@@ -3,4 +3,3 @@ struct southbridge_intel_pxhd_config
 	/* nothing */
 };
 
-extern struct chip_operations southbridge_intel_pxhd_ops;
diff --git a/src/southbridge/intel/sch/chip.h b/src/southbridge/intel/sch/chip.h
index 116d382768..1ae5c32e0c 100644
--- a/src/southbridge/intel/sch/chip.h
+++ b/src/southbridge/intel/sch/chip.h
@@ -35,6 +35,4 @@ struct southbridge_intel_sch_config {
 	uint8_t pirqh_routing;
 };
 
-extern struct chip_operations southbridge_intel_sch_ops;
-
 #endif
diff --git a/src/southbridge/nvidia/ck804/chip.h b/src/southbridge/nvidia/ck804/chip.h
index 1730205581..64d42254af 100644
--- a/src/southbridge/nvidia/ck804/chip.h
+++ b/src/southbridge/nvidia/ck804/chip.h
@@ -30,7 +30,5 @@ struct southbridge_nvidia_ck804_config {
 	unsigned int mac_eeprom_smbus;
 	unsigned int mac_eeprom_addr;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_nvidia_ck804_ops;
 
 #endif
diff --git a/src/southbridge/nvidia/mcp55/chip.h b/src/southbridge/nvidia/mcp55/chip.h
index 00fd0829a3..bfcd1e9e41 100644
--- a/src/southbridge/nvidia/mcp55/chip.h
+++ b/src/southbridge/nvidia/mcp55/chip.h
@@ -33,7 +33,5 @@ struct southbridge_nvidia_mcp55_config
 	unsigned int mac_eeprom_smbus;
 	unsigned int mac_eeprom_addr;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_nvidia_mcp55_ops;
 
 #endif
diff --git a/src/southbridge/ricoh/rl5c476/chip.h b/src/southbridge/ricoh/rl5c476/chip.h
index 922eece219..98d8a6936d 100644
--- a/src/southbridge/ricoh/rl5c476/chip.h
+++ b/src/southbridge/ricoh/rl5c476/chip.h
@@ -1,8 +1,6 @@
 #ifndef _SOUTHBRIDGE_RICOH_RL5C476
 #define _SOUTHBRIDGE_RICOH_RL5C476
 
-extern struct chip_operations southbridge_ricoh_rl5c476_ops;
-
 struct southbridge_ricoh_rl5c476_config {
 	int enable_cf;
 };
diff --git a/src/southbridge/sis/sis966/chip.h b/src/southbridge/sis/sis966/chip.h
index c169bb50cc..3669f3bae9 100644
--- a/src/southbridge/sis/sis966/chip.h
+++ b/src/southbridge/sis/sis966/chip.h
@@ -31,7 +31,5 @@ struct southbridge_sis_sis966_config
 	unsigned int mac_eeprom_smbus;
 	unsigned int mac_eeprom_addr;
 };
-struct chip_operations;
-extern struct chip_operations southbridge_sis_sis966_ops;
 
 #endif /* SIS966_CHIP_H */
diff --git a/src/southbridge/ti/pci1x2x/chip.h b/src/southbridge/ti/pci1x2x/chip.h
index 4c3676153d..2dbb1aab0d 100644
--- a/src/southbridge/ti/pci1x2x/chip.h
+++ b/src/southbridge/ti/pci1x2x/chip.h
@@ -1,8 +1,6 @@
 #ifndef SOUTHBRIDGE_TI_PCI1X2X_H
 #define SOUTHBRIDGE_TI_PCI1X2X_H
 
-extern struct chip_operations southbridge_ti_pci1x2x_ops;
-
 struct southbridge_ti_pci1x2x_config {
 	int scr;
 	int mrr;
diff --git a/src/southbridge/ti/pci7420/chip.h b/src/southbridge/ti/pci7420/chip.h
index d7ec2da410..cc218a12c9 100644
--- a/src/southbridge/ti/pci7420/chip.h
+++ b/src/southbridge/ti/pci7420/chip.h
@@ -21,8 +21,6 @@
 #ifndef _SOUTHBRIDGE_TI_PCI7420
 #define _SOUTHBRIDGE_TI_PCI7420
 
-extern struct chip_operations southbridge_ti_pci7420_ops;
-
 struct southbridge_ti_pci7420_config {
 	int smartcard_enabled;
 };
diff --git a/src/southbridge/ti/pcixx12/chip.h b/src/southbridge/ti/pcixx12/chip.h
index 42dc79cd1a..03151a8916 100644
--- a/src/southbridge/ti/pcixx12/chip.h
+++ b/src/southbridge/ti/pcixx12/chip.h
@@ -20,8 +20,6 @@
 #ifndef _SOUTHBRIDGE_TI_PCIXX12
 #define _SOUTHBRIDGE_TI_PCIXX12
 
-extern struct chip_operations southbridge_ti_pcixx12_ops;
-
 struct southbridge_ti_pcixx12_config {
 	int dummy;
 
diff --git a/src/southbridge/via/vt8231/chip.h b/src/southbridge/via/vt8231/chip.h
index 277ead7705..e858ff5086 100644
--- a/src/southbridge/via/vt8231/chip.h
+++ b/src/southbridge/via/vt8231/chip.h
@@ -1,8 +1,6 @@
 #ifndef _SOUTHBRIDGE_VIA_VT8231
 #define _SOUTHBRIDGE_VIA_VT8231
 
-extern struct chip_operations southbridge_via_vt8231_ops;
-
 struct southbridge_via_vt8231_config {
 	/* enables of Non-PCI devices */
 	int enable_native_ide;
diff --git a/src/southbridge/via/vt8235/chip.h b/src/southbridge/via/vt8235/chip.h
index 50f4a85547..eb1e82b7c8 100644
--- a/src/southbridge/via/vt8235/chip.h
+++ b/src/southbridge/via/vt8235/chip.h
@@ -1,8 +1,6 @@
 #ifndef _SOUTHBRIDGE_VIA_VT8235
 #define _SOUTHBRIDGE_VIA_VT8235
 
-extern struct chip_operations southbridge_via_vt8235_ops;
-
 struct southbridge_via_vt8235_config {
 	/* PCI function enables */
 	/* i.e. so that pci scan bus will find them. */
diff --git a/src/southbridge/via/vt8237r/chip.h b/src/southbridge/via/vt8237r/chip.h
index 510854716a..cbc795271a 100644
--- a/src/southbridge/via/vt8237r/chip.h
+++ b/src/southbridge/via/vt8237r/chip.h
@@ -22,8 +22,6 @@
 
 #include <stdint.h>
 
-extern struct chip_operations southbridge_via_vt8237r_ops;
-
 struct southbridge_via_vt8237r_config {
 	/**
 	 * Function disable. 1 = disabled.
diff --git a/src/southbridge/via/vt82c686/chip.h b/src/southbridge/via/vt82c686/chip.h
index 8effc737e4..44b3e2dfa1 100644
--- a/src/southbridge/via/vt82c686/chip.h
+++ b/src/southbridge/via/vt82c686/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_via_vt82c686_ops;
-
 struct superio_via_vt82c686_config {
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/fintek/f71805f/chip.h b/src/superio/fintek/f71805f/chip.h
index 60eb684a32..603dbee365 100644
--- a/src/superio/fintek/f71805f/chip.h
+++ b/src/superio/fintek/f71805f/chip.h
@@ -26,8 +26,6 @@
 
 /* This chip doesn't have keyboard and mouse support. */
 
-extern struct chip_operations superio_fintek_f71805f_ops;
-
 struct superio_fintek_f71805f_config {
 
 };
diff --git a/src/superio/fintek/f71859/chip.h b/src/superio/fintek/f71859/chip.h
index 157ed26ab1..bd45ac0376 100644
--- a/src/superio/fintek/f71859/chip.h
+++ b/src/superio/fintek/f71859/chip.h
@@ -24,8 +24,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_fintek_f71859_ops;
-
 struct superio_fintek_f71859_config {
 
 };
diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h
index ade7498e35..522603b11a 100644
--- a/src/superio/fintek/f71863fg/chip.h
+++ b/src/superio/fintek/f71863fg/chip.h
@@ -25,8 +25,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_fintek_f71863fg_ops;
-
 struct superio_fintek_f71863fg_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h
index bd41dd679d..d897fae0b2 100644
--- a/src/superio/fintek/f71872/chip.h
+++ b/src/superio/fintek/f71872/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_fintek_f71872_ops;
-
 struct superio_fintek_f71872_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h
index 65ae8700ab..49e8cdd52b 100644
--- a/src/superio/fintek/f71889/chip.h
+++ b/src/superio/fintek/f71889/chip.h
@@ -25,8 +25,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_fintek_f71889_ops;
-
 struct superio_fintek_f71889_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h
index 711e2d0a58..29fb3a671a 100644
--- a/src/superio/fintek/f81865f/chip.h
+++ b/src/superio/fintek/f81865f/chip.h
@@ -26,8 +26,6 @@
 
 /* This chip doesn't have keyboard and mouse support. */
 
-extern struct chip_operations superio_fintek_f81865f_ops;
-
 struct superio_fintek_f81865f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/intel/i3100/chip.h b/src/superio/intel/i3100/chip.h
index 4ed322527a..05e2f452bf 100644
--- a/src/superio/intel/i3100/chip.h
+++ b/src/superio/intel/i3100/chip.h
@@ -24,8 +24,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_intel_i3100_ops;
-
 struct superio_intel_i3100_config {
 };
 
diff --git a/src/superio/ite/it8661f/chip.h b/src/superio/ite/it8661f/chip.h
index 64b2cf873f..1d9d1f9ba3 100644
--- a/src/superio/ite/it8661f/chip.h
+++ b/src/superio/ite/it8661f/chip.h
@@ -26,8 +26,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8661f_ops;
-
 struct superio_ite_it8661f_config {
 
 };
diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h
index 7fa7e26f57..7659c87aee 100644
--- a/src/superio/ite/it8671f/chip.h
+++ b/src/superio/ite/it8671f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8671f_ops;
-
 struct superio_ite_it8671f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h
index 126180a19f..ace1725378 100644
--- a/src/superio/ite/it8673f/chip.h
+++ b/src/superio/ite/it8673f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8673f_ops;
-
 struct superio_ite_it8673f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8705f/chip.h b/src/superio/ite/it8705f/chip.h
index df620a8906..ac2ba77e87 100644
--- a/src/superio/ite/it8705f/chip.h
+++ b/src/superio/ite/it8705f/chip.h
@@ -26,8 +26,6 @@
 #include <device/device.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8705f_ops;
-
 struct superio_ite_it8705f_config {
 
 };
diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h
index 18630066db..bb200e5762 100644
--- a/src/superio/ite/it8712f/chip.h
+++ b/src/superio/ite/it8712f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8712f_ops;
-
 struct superio_ite_it8712f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h
index 16b69ce261..8aaed3533d 100644
--- a/src/superio/ite/it8716f/chip.h
+++ b/src/superio/ite/it8716f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8716f_ops;
-
 struct superio_ite_it8716f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h
index 43f7152fbb..e70967a334 100644
--- a/src/superio/ite/it8718f/chip.h
+++ b/src/superio/ite/it8718f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8718f_ops;
-
 struct superio_ite_it8718f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8721f/chip.h b/src/superio/ite/it8721f/chip.h
index 3717d1967f..eb91566da2 100644
--- a/src/superio/ite/it8721f/chip.h
+++ b/src/superio/ite/it8721f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8721f_ops;
-
 struct superio_ite_it8721f_config {
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h
index e91f6fac53..1bfe8610b7 100644
--- a/src/superio/ite/it8772f/chip.h
+++ b/src/superio/ite/it8772f/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_ite_it8772f_ops;
-
 struct superio_ite_it8772f_config {
 	struct pc_keyboard keyboard;
 
diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h
index 4ae78f8ac0..2487b0c9a5 100644
--- a/src/superio/nsc/pc8374/chip.h
+++ b/src/superio/nsc/pc8374/chip.h
@@ -22,9 +22,6 @@
 #ifndef SUPERIO_NSC_PC8374_CHIP_H
 #define SUPERIO_NSC_PC8374_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_nsc_pc8374_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h
index b9f5a7a9f9..4a9954a645 100644
--- a/src/superio/nsc/pc87309/chip.h
+++ b/src/superio/nsc/pc87309/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_nsc_pc87309_ops;
-
 struct superio_nsc_pc87309_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h
index 46b56afb71..41e7e702ad 100644
--- a/src/superio/nsc/pc87351/chip.h
+++ b/src/superio/nsc/pc87351/chip.h
@@ -22,9 +22,6 @@
 #ifndef SUPERIO_NSC_PC87351_CHIP_H
 #define SUPERIO_NSC_PC87351_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_nsc_pc87351_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h
index 0cc6a89ee7..e562733710 100644
--- a/src/superio/nsc/pc87360/chip.h
+++ b/src/superio/nsc/pc87360/chip.h
@@ -22,9 +22,6 @@
 #ifndef SUPERIO_NSC_PC87360_CHIP_H
 #define SUPERIO_NSC_PC87360_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_nsc_pc87360_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h
index 6f656d4a65..1377bb8cd0 100644
--- a/src/superio/nsc/pc87366/chip.h
+++ b/src/superio/nsc/pc87366/chip.h
@@ -22,8 +22,6 @@
 #ifndef SUPERIO_NSC_PC87366_CHIP_H
 #define SUPERIO_NSC_PC87366_CHIP_H
 
-extern struct chip_operations superio_nsc_pc87366_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc87382/chip.h b/src/superio/nsc/pc87382/chip.h
index 8cc049f52f..a9f0200f18 100644
--- a/src/superio/nsc/pc87382/chip.h
+++ b/src/superio/nsc/pc87382/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_NSC_PC87382_CHIP_H
 
 #include <uart8250.h>
-extern struct chip_operations superio_nsc_pc87382_ops;
 
 struct superio_nsc_pc87382_config {
 
diff --git a/src/superio/nsc/pc87384/chip.h b/src/superio/nsc/pc87384/chip.h
index ef202fc68b..1c49725235 100644
--- a/src/superio/nsc/pc87384/chip.h
+++ b/src/superio/nsc/pc87384/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_NSC_PC87384_CHIP_H
 
 #include <uart8250.h>
-extern struct chip_operations superio_nsc_pc87384_ops;
 
 struct superio_nsc_pc87384_config {
 
diff --git a/src/superio/nsc/pc87392/chip.h b/src/superio/nsc/pc87392/chip.h
index 8b5fc52bfe..a6ebf1b5d9 100644
--- a/src/superio/nsc/pc87392/chip.h
+++ b/src/superio/nsc/pc87392/chip.h
@@ -21,8 +21,6 @@
 #ifndef SUPERIO_NSC_PC87392_CHIP_H
 #define SUPERIO_NSC_PC87392_CHIP_H
 
-extern struct chip_operations superio_nsc_pc87392_ops;
-
 #include <uart8250.h>
 
 struct superio_nsc_pc87392_config {
diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h
index ec3c381c92..1d85fd9c21 100644
--- a/src/superio/nsc/pc87417/chip.h
+++ b/src/superio/nsc/pc87417/chip.h
@@ -23,8 +23,6 @@
 #ifndef SUPERIO_NSC_PC87417_CHIP_H
 #define SUPERIO_NSC_PC87417_CHIP_H
 
-extern struct chip_operations superio_nsc_pc87417_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h
index 610dbdf8f7..46c358f0c6 100644
--- a/src/superio/nsc/pc87427/chip.h
+++ b/src/superio/nsc/pc87427/chip.h
@@ -22,8 +22,6 @@
 #ifndef SUPERIO_NSC_PC87427_CHIP_H
 #define SUPERIO_NSC_PC87427_CHIP_H
 
-extern struct chip_operations superio_nsc_pc87427_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
index cc43323f79..4d1df1f7b6 100644
--- a/src/superio/nsc/pc97307/chip.h
+++ b/src/superio/nsc/pc97307/chip.h
@@ -28,8 +28,6 @@
 #define PNP_DATA_REG    0x15D
 #endif
 
-extern struct chip_operations superio_nsc_pc97307_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
index 4eb0c19cd9..23f8d2e743 100644
--- a/src/superio/nsc/pc97317/chip.h
+++ b/src/superio/nsc/pc97317/chip.h
@@ -28,8 +28,6 @@
 #define PNP_DATA_REG    0x15D
 #endif
 
-extern struct chip_operations superio_nsc_pc97317_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h
index c921120501..75dd194e1e 100644
--- a/src/superio/nuvoton/wpcm450/chip.h
+++ b/src/superio/nuvoton/wpcm450/chip.h
@@ -21,9 +21,6 @@
 #ifndef SUPERIO_NUVOTON_WPCM450_CHIP_H
 #define SUPERIO_NUVOTON_WPCM450_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_nuvoton_wpcm450_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/renesas/m3885x/chip.h b/src/superio/renesas/m3885x/chip.h
index da2336d5df..2b0b76a512 100644
--- a/src/superio/renesas/m3885x/chip.h
+++ b/src/superio/renesas/m3885x/chip.h
@@ -23,8 +23,6 @@
 #include <device/device.h>
 #include <pc80/keyboard.h>
 
-extern struct chip_operations superio_renesas_m3885x_ops;
-
 struct superio_renesas_m3885x_config {
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h
index 450ef75fbe..8ca701f197 100644
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ b/src/superio/smsc/fdc37m60x/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_smsc_fdc37m60x_ops;
-
 struct superio_smsc_fdc37m60x_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
index 858cf532c1..caf5b14722 100644
--- a/src/superio/smsc/fdc37n972/chip.h
+++ b/src/superio/smsc/fdc37n972/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_smsc_fdc37n972_ops;
-
 struct superio_smsc_fdc37n972_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h
index 40aff0bf7d..6c5425a656 100644
--- a/src/superio/smsc/kbc1100/chip.h
+++ b/src/superio/smsc/kbc1100/chip.h
@@ -23,9 +23,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_kbc1100_ops;
-
 struct superio_smsc_kbc1100_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h
index 754d63d967..eab8c9bde1 100644
--- a/src/superio/smsc/lpc47b272/chip.h
+++ b/src/superio/smsc/lpc47b272/chip.h
@@ -21,9 +21,6 @@
 #ifndef SUPERIO_SMSC_LPC47B272_CHIP_H
 #define SUPERIO_SMSC_LPC47B272_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_lpc47b272_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h
index 48fc6e475d..e0d131f9a0 100644
--- a/src/superio/smsc/lpc47b397/chip.h
+++ b/src/superio/smsc/lpc47b397/chip.h
@@ -23,9 +23,6 @@
 #ifndef SUPERIO_SMSC_LPC47B397_CHIP_H
 #define SUPERIO_SMSC_LPC47B397_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_lpc47b397_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h
index 6d6ee97603..c8c293c84c 100644
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ b/src/superio/smsc/lpc47m10x/chip.h
@@ -25,9 +25,6 @@
 #ifndef SUPERIO_SMSC_LPC47M10X_CHIP_H
 #define SUPERIO_SMSC_LPC47M10X_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_lpc47m10x_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h
index 57aba06dd8..2b5489a2d7 100644
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ b/src/superio/smsc/lpc47m15x/chip.h
@@ -20,9 +20,6 @@
 #ifndef SUPERIO_SMSC_LPC47M15X_CHIP_H
 #define SUPERIO_SMSC_LPC47M15X_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_lpc47m15x_ops;
-
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
diff --git a/src/superio/smsc/lpc47n217/chip.h b/src/superio/smsc/lpc47n217/chip.h
index 89a778c22c..b0fbe8cfe6 100644
--- a/src/superio/smsc/lpc47n217/chip.h
+++ b/src/superio/smsc/lpc47n217/chip.h
@@ -21,9 +21,6 @@
 #ifndef SUPERIO_SMSC_LPC47N217_CHIP_H
 #define SUPERIO_SMSC_LPC47N217_CHIP_H
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_lpc47n217_ops;
-
 #include <uart8250.h>
 
 struct superio_smsc_lpc47n217_config {
diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h
index 8b3a2c9dfc..36ae6e33b5 100644
--- a/src/superio/smsc/lpc47n227/chip.h
+++ b/src/superio/smsc/lpc47n227/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_smsc_lpc47n227_ops;
-
 struct superio_smsc_lpc47n227_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/mec1308/chip.h b/src/superio/smsc/mec1308/chip.h
index 3826888dd0..0ebb1b6cd7 100644
--- a/src/superio/smsc/mec1308/chip.h
+++ b/src/superio/smsc/mec1308/chip.h
@@ -23,9 +23,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_mec1308_ops;
-
 struct superio_smsc_mec1308_config {
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/smsc/sch4037/chip.h b/src/superio/smsc/sch4037/chip.h
index 3223750bf6..d79ccc16f7 100644
--- a/src/superio/smsc/sch4037/chip.h
+++ b/src/superio/smsc/sch4037/chip.h
@@ -23,9 +23,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_sch4037_ops;
-
 struct superio_smsc_sch4037_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/sio1036/chip.h b/src/superio/smsc/sio1036/chip.h
index abed430cf8..a37f84f2a8 100644
--- a/src/superio/smsc/sio1036/chip.h
+++ b/src/superio/smsc/sio1036/chip.h
@@ -23,9 +23,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct chip_operations;
-extern struct chip_operations superio_smsc_kbc1100_ops;
-
 struct superio_smsc_sio1036_config {
 	struct uart8250 com1;
 };
diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
index cd6e87bede..22d8a3ab2b 100644
--- a/src/superio/smsc/sio10n268/chip.h
+++ b/src/superio/smsc/sio10n268/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_smsc_sio10n268_ops;
-
 struct superio_smsc_sio10n268_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h
index 86f93be58d..0f3a14d29d 100644
--- a/src/superio/smsc/smscsuperio/chip.h
+++ b/src/superio/smsc/smscsuperio/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_smsc_smscsuperio_ops;
-
 struct superio_smsc_smscsuperio_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/via/vt1211/chip.h b/src/superio/via/vt1211/chip.h
index 3fcd6ae1b1..89d64cda20 100644
--- a/src/superio/via/vt1211/chip.h
+++ b/src/superio/via/vt1211/chip.h
@@ -23,8 +23,6 @@
 
 #include <uart8250.h>
 
-extern struct chip_operations superio_via_vt1211_ops;
-
 struct superio_via_vt1211_config {
 
 };
diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h
index b516aacad0..5fdbd16075 100644
--- a/src/superio/winbond/w83627dhg/chip.h
+++ b/src/superio/winbond/w83627dhg/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83627dhg_ops;
-
 struct superio_winbond_w83627dhg_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h
index a16135dc0e..51137461af 100644
--- a/src/superio/winbond/w83627ehg/chip.h
+++ b/src/superio/winbond/w83627ehg/chip.h
@@ -25,8 +25,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83627ehg_ops;
-
 struct superio_winbond_w83627ehg_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h
index 64d9920464..b7f2177590 100644
--- a/src/superio/winbond/w83627hf/chip.h
+++ b/src/superio/winbond/w83627hf/chip.h
@@ -26,8 +26,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83627hf_ops;
-
 struct superio_winbond_w83627hf_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h
index ce06485665..8268e5b892 100644
--- a/src/superio/winbond/w83627thg/chip.h
+++ b/src/superio/winbond/w83627thg/chip.h
@@ -26,8 +26,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83627thg_ops;
-
 struct superio_winbond_w83627thg_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h
index 2802382ab9..d23eac2ac9 100644
--- a/src/superio/winbond/w83627uhg/chip.h
+++ b/src/superio/winbond/w83627uhg/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83627uhg_ops;
-
 struct superio_winbond_w83627uhg_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index 2359b6679f..4d36af9150 100644
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -23,8 +23,6 @@
 
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83697hf_ops;
-
 struct superio_winbond_w83697hf_config {
 	unsigned int hwmon_fan1_divisor;
 	unsigned int hwmon_fan2_divisor;
diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h
index aacb00918c..d6c85bfedd 100644
--- a/src/superio/winbond/w83977f/chip.h
+++ b/src/superio/winbond/w83977f/chip.h
@@ -24,8 +24,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83977f_ops;
-
 struct superio_winbond_w83977f_config {
 
 	struct pc_keyboard keyboard;
diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h
index 80c4afd856..2a594e3c32 100644
--- a/src/superio/winbond/w83977tf/chip.h
+++ b/src/superio/winbond/w83977tf/chip.h
@@ -26,8 +26,6 @@
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-extern struct chip_operations superio_winbond_w83977tf_ops;
-
 struct superio_winbond_w83977tf_config {
 
 	struct pc_keyboard keyboard;
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index eb996a7e9e..fe4c3b8e12 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -624,6 +624,14 @@ int main(int argc, char** argv) {
 			h = h->next;
 			fprintf(autogen, "#include \"%s/chip.h\"\n", h->name);
 		}
+		h = &headers;
+		while (h->next) {
+			h = h->next;
+			char *name_underscore = strdup(h->name);
+			translate_name(name_underscore, 0);
+			fprintf(autogen, "extern struct chip_operations %s_ops;\n", name_underscore);
+			free(name_underscore);
+		}
 
 		walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL);
 		fprintf(autogen, "\n/* pass 0 */\n");