3 files changed, 14 insertions, 20 deletions
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index ac0e132a24..72e70bacea 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -282,9 +282,6 @@ static int smbios_walk_device_tree(device_t tree, int *handle, unsigned long *cu
 
 		if (dev->ops && dev->ops->get_smbios_data)
 			len += dev->ops->get_smbios_data(dev, handle, current);
-
-		if (dev->chip_ops && dev->chip_ops->get_smbios_data)
-			len += dev->chip_ops->get_smbios_data(dev, handle, current);
 	}
 	return len;
 }
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 7e07dc15d1..ab5ab14ad4 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -17,9 +17,6 @@ struct smbus_bus_operations;
 struct chip_operations {
 	void (*enable_dev)(struct device *dev);
 	const char *name;
-#if CONFIG_GENERATE_SMBIOS_TABLES
-	int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current);
-#endif
 };
 
 #define CHIP_NAME(X) .name = X,
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 9d44c9aead..bd60a98b16 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -251,19 +251,6 @@ static void mainboard_init(device_t dev)
 	lumpy_ec_init();
 }
 
-// mainboard_enable is executed as first thing after
-// enumerate_buses().
-
-static void mainboard_enable(device_t dev)
-{
-	dev->ops->init = mainboard_init;
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-	/* Install custom int15 handler for VGA OPROM */
-	mainboard_interrupt_handlers(0x15, &int15_handler);
-#endif
-	verb_setup();
-}
-
 static int lumpy_smbios_type41_irq(int *handle, unsigned long *current,
 				   const char *name, u8 irq, u8 addr)
 {
@@ -308,9 +295,22 @@ static int lumpy_onboard_smbios_data(device_t dev, int *handle,
 	return len;
 }
 
+// mainboard_enable is executed as first thing after
+// enumerate_buses().
+
+static void mainboard_enable(device_t dev)
+{
+	dev->ops->init = mainboard_init;
+	dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
+	/* Install custom int15 handler for VGA OPROM */
+	mainboard_interrupt_handlers(0x15, &int15_handler);
+#endif
+	verb_setup();
+}
+
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Samsung Lumpy ChromeBook")
 	.enable_dev = mainboard_enable,
-	.get_smbios_data = lumpy_onboard_smbios_data,
 };