Drop explicit NULL initializations from `device_operations`

Unmentioned fields are initialized with 0 (or NULL) implicitly. Beside
that, the struct has grown over the years. There are too many optional
fields to list them all.

Change-Id: Icb9e14c58153d7c14817bcde148e86e977666e4b
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40126
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

123 files changed, 0 insertions, 207 deletions

diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index 36a70f9ec7..152bde4fd4 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -251,6 +251,5 @@ struct device_operations default_azalia_audio_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_audio_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_audio_pci_ops,
 };
diff --git a/src/device/cardbus_device.c b/src/device/cardbus_device.c
index e56202a1ed..b3dc669892 100644
--- a/src/device/cardbus_device.c
+++ b/src/device/cardbus_device.c
@@ -157,8 +157,6 @@ struct device_operations default_cardbus_ops_bus = {
 	.read_resources   = cardbus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = cardbus_enable_resources,
-	.init             = 0,
 	.scan_bus         = pci_scan_bridge,
-	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 };
diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c
index 4256550747..7815415a21 100644
--- a/src/device/hypertransport.c
+++ b/src/device/hypertransport.c
@@ -495,9 +495,7 @@ struct device_operations default_ht_ops_bus = {
 	.read_resources   = pci_bus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_bus_enable_resources,
-	.init             = 0,
 	.scan_bus         = ht_scan_bridge,
-	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 	.ops_pci          = &ht_bus_ops_pci,
 };
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 0099470160..02cb5addfb 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -761,8 +761,6 @@ struct device_operations default_pci_ops_dev = {
 	.acpi_fill_ssdt    = pci_rom_ssdt,
 #endif
 	.init             = pci_dev_init,
-	.scan_bus         = 0,
-	.enable           = 0,
 	.ops_pci          = &pci_dev_ops_pci,
 };
 
@@ -775,9 +773,7 @@ struct device_operations default_pci_ops_bus = {
 	.read_resources   = pci_bus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_bus_enable_resources,
-	.init             = 0,
 	.scan_bus         = pci_scan_bridge,
-	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 	.ops_pci          = &pci_bus_ops_pci,
 };
diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c
index 1a4854d381..07d559ac11 100644
--- a/src/device/pciexp_device.c
+++ b/src/device/pciexp_device.c
@@ -502,9 +502,7 @@ struct device_operations default_pciexp_ops_bus = {
 	.read_resources   = pci_bus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_bus_enable_resources,
-	.init             = 0,
 	.scan_bus         = pciexp_scan_bridge,
-	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 	.ops_pci          = &pciexp_bus_ops_pci,
 };
diff --git a/src/device/pcix_device.c b/src/device/pcix_device.c
index 32ad16e51f..88f58b4995 100644
--- a/src/device/pcix_device.c
+++ b/src/device/pcix_device.c
@@ -123,9 +123,7 @@ struct device_operations default_pcix_ops_bus = {
 	.read_resources   = pci_bus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_bus_enable_resources,
-	.init             = 0,
 	.scan_bus         = pcix_scan_bridge,
-	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 	.ops_pci          = &pcix_bus_ops_pci,
 };
diff --git a/src/drivers/aspeed/ast2050/ast2050.c b/src/drivers/aspeed/ast2050/ast2050.c
index 8bc73078c7..4230146b0c 100644
--- a/src/drivers/aspeed/ast2050/ast2050.c
+++ b/src/drivers/aspeed/ast2050/ast2050.c
@@ -67,7 +67,6 @@ static struct device_operations aspeed_ast2050_ops  = {
 	.set_resources    = aspeed_ast2050_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = aspeed_ast2050_init,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver aspeed_ast2050_driver __pci_driver = {
diff --git a/src/drivers/dec/21143/21143.c b/src/drivers/dec/21143/21143.c
index 0230935752..ff64cf3490 100644
--- a/src/drivers/dec/21143/21143.c
+++ b/src/drivers/dec/21143/21143.c
@@ -43,7 +43,6 @@ static struct device_operations dec_21143_ops = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = dec_21143_enable,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver dec_21143_driver __pci_driver = {
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index d9e4ce1d6e..8d08ac1b4c 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -140,7 +140,6 @@ static struct device_operations qemu_graph_ops = {
 	.set_resources	  = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = bochs_init,
-	.scan_bus	  = 0,
 };
 
 static const struct pci_driver qemu_stdvga_driver __pci_driver = {
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index 6b1968c31d..4f03578438 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -340,7 +340,6 @@ static struct device_operations qemu_cirrus_graph_ops = {
 	.set_resources	  = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = cirrus_init,
-	.scan_bus	  = 0,
 };
 
 static const struct pci_driver qemu_cirrus_driver __pci_driver = {
diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c
index 232a826b4c..cb2414f30c 100644
--- a/src/drivers/intel/i210/i210.c
+++ b/src/drivers/intel/i210/i210.c
@@ -228,8 +228,6 @@ static struct device_operations i210_ops  = {
 	.set_resources    = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = init,
-	.scan_bus         = 0,
-	.ops_pci          = 0,
 };
 
 static const unsigned short i210_device_ids[] = { 0x1537, 0x1538, 0x1533, 0 };
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index 51470b0a78..5cc70ceddd 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -162,7 +162,6 @@ static struct device_operations atl1e_ops  = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = atl1e_init,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver atl1e_driver __pci_driver = {
diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c
index b1d72de084..620dab952e 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -317,8 +317,6 @@ static struct device_operations ne2k_ops  = {
 	.read_resources   = read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init             = 0,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver ne2k_driver __pci_driver = {
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index c764b433b6..6e9437005d 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -372,7 +372,6 @@ static struct device_operations r8168_ops  = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = r8168_init,
-	.scan_bus         = 0,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name        = r8168_net_acpi_name,
 	.acpi_fill_ssdt   = r8168_net_fill_ssdt,
diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c
index fd425824c0..08e328da72 100644
--- a/src/drivers/ricoh/rce822/rce822.c
+++ b/src/drivers/ricoh/rce822/rce822.c
@@ -58,7 +58,6 @@ static struct device_operations rce822_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= rce822_init,
 	.enable			= rce822_enable,
-	.scan_bus		= 0,
 	.ops_pci		= &lops_pci,
 };
 
diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c
index 355e0f90a8..b305a8c848 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c
@@ -158,8 +158,6 @@ static struct device_operations nc_fpga_ops  = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = nc_fpga_init,
-	.scan_bus         = 0,
-	.ops_pci          = 0,
 };
 
 static const unsigned short nc_fpga_device_ids[] = { 0x4080, 0x4091, 0 };
diff --git a/src/drivers/sil/3114/sil_sata.c b/src/drivers/sil/3114/sil_sata.c
index c38e642016..a249181ea7 100644
--- a/src/drivers/sil/3114/sil_sata.c
+++ b/src/drivers/sil/3114/sil_sata.c
@@ -38,7 +38,6 @@ static struct device_operations si_sata_ops  = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = si_sata_init,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver si_sata_driver __pci_driver = {
diff --git a/src/drivers/uart/oxpcie.c b/src/drivers/uart/oxpcie.c
index 999c6baec9..60b524576e 100644
--- a/src/drivers/uart/oxpcie.c
+++ b/src/drivers/uart/oxpcie.c
@@ -52,7 +52,6 @@ static struct device_operations oxford_oxpcie_ops = {
 	.set_resources    = oxford_oxpcie_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = oxford_oxpcie_enable,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver oxford_oxpcie_driver __pci_driver = {
diff --git a/src/drivers/xgi/z9s/z9s.c b/src/drivers/xgi/z9s/z9s.c
index 62c80aa271..c0aa3b3d91 100644
--- a/src/drivers/xgi/z9s/z9s.c
+++ b/src/drivers/xgi/z9s/z9s.c
@@ -50,7 +50,6 @@ static struct device_operations xgi_z9s_ops  = {
 	.set_resources    = xgi_z9s_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = xgi_z9s_init,
-	.scan_bus         = 0,
 };
 
 static const struct pci_driver xgi_z9s_driver __pci_driver = {
diff --git a/src/mainboard/emulation/qemu-i440fx/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c
index 5e9b3208c6..751035ec34 100644
--- a/src/mainboard/emulation/qemu-i440fx/mainboard.c
+++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c
@@ -36,7 +36,6 @@ static struct device_operations nb_operations = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = qemu_nb_init,
-	.ops_pci          = 0,
 };
 
 static const struct pci_driver nb_driver __pci_driver = {
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 38ab9df71b..e5df0168c0 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -236,8 +236,6 @@ static const char *qemu_acpi_name(const struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources		= cpu_pci_domain_read_resources,
 	.set_resources		= cpu_pci_domain_set_resources,
-	.enable_resources	= NULL,
-	.init			= NULL,
 	.scan_bus		= pci_domain_scan_bus,
 #if CONFIG(GENERATE_SMBIOS_TABLES)
 	.get_smbios_data	= qemu_get_smbios_data,
diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c
index 6bb99cd24d..460864aac1 100644
--- a/src/mainboard/emulation/qemu-q35/mainboard.c
+++ b/src/mainboard/emulation/qemu-q35/mainboard.c
@@ -55,7 +55,6 @@ static struct device_operations nb_operations = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = qemu_nb_init,
-	.ops_pci          = 0,
 };
 
 static const struct pci_driver nb_driver __pci_driver = {
diff --git a/src/northbridge/amd/agesa/family15tn/iommu.c b/src/northbridge/amd/agesa/family15tn/iommu.c
index a7bf958865..8719443c63 100644
--- a/src/northbridge/amd/agesa/family15tn/iommu.c
+++ b/src/northbridge/amd/agesa/family15tn/iommu.c
@@ -56,8 +56,6 @@ static struct device_operations iommu_ops = {
 	.read_resources = iommu_read_resources,
 	.set_resources = iommu_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index c5f649e91f..eb13e9655b 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -563,8 +563,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = DEVICE_NOOP,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family15_northbridge __pci_driver = {
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index d9c3c36c25..c9a0b13143 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -562,8 +562,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = DEVICE_NOOP,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family16_northbridge __pci_driver = {
diff --git a/src/northbridge/amd/pi/00630F01/iommu.c b/src/northbridge/amd/pi/00630F01/iommu.c
index 77eea90769..970e7592bc 100644
--- a/src/northbridge/amd/pi/00630F01/iommu.c
+++ b/src/northbridge/amd/pi/00630F01/iommu.c
@@ -56,8 +56,6 @@ static struct device_operations iommu_ops = {
 	.read_resources = iommu_read_resources,
 	.set_resources = iommu_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 30c68d80fb..e34cb71149 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -557,8 +557,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = DEVICE_NOOP,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family15_northbridge __pci_driver = {
@@ -775,7 +773,6 @@ static struct device_operations pci_domain_ops = {
 	.read_resources	  = domain_read_resources,
 	.set_resources	  = domain_set_resources,
 	.enable_resources = domain_enable_resources,
-	.init		  = NULL,
 	.scan_bus	  = pci_domain_scan_bus,
 };
 
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index 44ff37003c..74a5553a96 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -547,8 +547,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = northbridge_init,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family15_northbridge __pci_driver = {
@@ -784,7 +782,6 @@ static struct device_operations pci_domain_ops = {
 	.read_resources	  = domain_read_resources,
 	.set_resources	  = domain_set_resources,
 	.enable_resources = domain_enable_resources,
-	.init		  = NULL,
 	.scan_bus	  = pci_domain_scan_bus,
 	.acpi_name	  = domain_acpi_name,
 };
diff --git a/src/northbridge/amd/pi/00730F01/iommu.c b/src/northbridge/amd/pi/00730F01/iommu.c
index a9f6f9772a..99233025b3 100644
--- a/src/northbridge/amd/pi/00730F01/iommu.c
+++ b/src/northbridge/amd/pi/00730F01/iommu.c
@@ -46,8 +46,6 @@ static struct device_operations iommu_ops = {
 	.read_resources = iommu_read_resources,
 	.set_resources = iommu_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 0a07dfa1d5..9f55596433 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -777,8 +777,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = northbridge_init,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family16_northbridge __pci_driver = {
@@ -1048,7 +1046,6 @@ static struct device_operations pci_domain_ops = {
 	.read_resources	  = domain_read_resources,
 	.set_resources	  = domain_set_resources,
 	.enable_resources = domain_enable_resources,
-	.init		  = NULL,
 	.scan_bus	  = pci_domain_scan_bus,
 	.acpi_name        = domain_acpi_name,
 };
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 074f63adaf..8dd701b9f2 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -80,8 +80,6 @@ static struct pci_operations intel_pci_ops = {
 static struct device_operations pci_domain_ops = {
 	.read_resources   = mch_domain_read_resources,
 	.set_resources    = mch_domain_set_resources,
-	.enable_resources = NULL,
-	.init             = NULL,
 	.scan_bus         = pci_domain_scan_bus,
 	.ops_pci          = &intel_pci_ops,
 };
@@ -96,7 +94,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = cpu_bus_init,
-	.scan_bus         = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 0bbd3d532c..436fb9a10a 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -267,8 +267,6 @@ static struct device_operations gma_func0_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.acpi_fill_ssdt		= gma_generate_ssdt,
 	.init			= gma_func0_init,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= &gma_pci_ops,
 	.acpi_name		= gma_acpi_name,
 	.write_acpi_tables	= gma_write_acpi_tables,
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 9484cd9fab..d4a4828ab6 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -229,7 +229,6 @@ void northbridge_write_smram(u8 smram)
 static struct device_operations pci_domain_ops = {
 	.read_resources   = mch_domain_read_resources,
 	.set_resources    = mch_domain_set_resources,
-	.enable_resources = NULL,
 	.init             = mch_domain_init,
 	.scan_bus         = pci_domain_scan_bus,
 	.write_acpi_tables = northbridge_write_acpi_tables,
@@ -242,7 +241,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = mp_cpu_bus_init,
-	.scan_bus         = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 4c11bd1c64..8c28c53a3f 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -565,8 +565,6 @@ static struct device_operations gma_func0_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= gma_func0_init,
 	.acpi_fill_ssdt		= gma_generate_ssdt,
-	.scan_bus		= NULL,
-	.enable			= NULL,
 	.ops_pci		= &gma_pci_ops,
 	.write_acpi_tables	= gma_write_acpi_tables,
 };
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index 5a1e7a8ef9..9cd7ad4889 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -106,7 +106,6 @@ static struct device_operations minihd_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= minihd_init,
-	.scan_bus		= NULL,
 	.ops_pci		= &minihd_pci_ops,
 };
 
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 4e16ca06e3..b764aadb30 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -92,8 +92,6 @@ static const char *northbridge_acpi_name(const struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources    = pci_domain_read_resources,
 	.set_resources     = pci_domain_set_resources,
-	.enable_resources  = NULL,
-	.init              = NULL,
 	.scan_bus          = pci_domain_scan_bus,
 	.acpi_name         = northbridge_acpi_name,
 	.write_acpi_tables = northbridge_write_acpi_tables,
@@ -477,7 +475,6 @@ static struct device_operations mc_ops = {
 	.enable_resources       = pci_dev_enable_resources,
 	.init                   = northbridge_init,
 	.acpi_fill_ssdt		= generate_cpu_entries,
-	.scan_bus               = NULL,
 	.ops_pci                = &intel_pci_ops,
 };
 
@@ -500,7 +497,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = mp_cpu_bus_init,
-	.scan_bus         = NULL,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index d23a8436f8..1d0251f0ce 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -31,8 +31,6 @@ static struct device_operations northbridge_operations = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = northbridge_init,
-	.enable           = 0,
-	.ops_pci          = 0,
 };
 
 static const struct pci_driver northbridge_driver __pci_driver = {
@@ -82,8 +80,6 @@ static void i440bx_domain_set_resources(struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources		= pci_domain_read_resources,
 	.set_resources		= i440bx_domain_set_resources,
-	.enable_resources	= NULL,
-	.init			= NULL,
 	.scan_bus		= pci_domain_scan_bus,
 };
 
@@ -97,7 +93,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = cpu_bus_init,
-	.scan_bus         = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index f5a964ab82..252d984d2b 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -816,8 +816,6 @@ static struct device_operations gma_func0_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= gma_func0_init,
 	.acpi_fill_ssdt		= gma_generate_ssdt,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.disable		= gma_func0_disable,
 	.ops_pci		= &gma_pci_ops,
 	.acpi_name		= gma_acpi_name,
@@ -830,8 +828,6 @@ static struct device_operations gma_func1_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= gma_func1_init,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= &gma_pci_ops,
 };
 
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 16cf5e6ae2..17b790740e 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -167,8 +167,6 @@ void northbridge_write_smram(u8 smram)
 static struct device_operations pci_domain_ops = {
 	.read_resources   = mch_domain_read_resources,
 	.set_resources    = mch_domain_set_resources,
-	.enable_resources = NULL,
-	.init             = NULL,
 	.scan_bus         = pci_domain_scan_bus,
 	.acpi_name        = northbridge_acpi_name,
 };
@@ -196,7 +194,6 @@ static struct device_operations mc_ops = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.acpi_fill_ssdt   = generate_cpu_entries,
-	.scan_bus         = 0,
 	.ops_pci          = &intel_pci_ops,
 };
 
@@ -216,7 +213,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = mp_cpu_bus_init,
-	.scan_bus         = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c
index 6dbc156b98..42bf7f9507 100644
--- a/src/northbridge/intel/ironlake/gma.c
+++ b/src/northbridge/intel/ironlake/gma.c
@@ -257,8 +257,6 @@ static struct device_operations gma_func0_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.acpi_fill_ssdt		= gma_generate_ssdt,
 	.init			= gma_func0_init,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= &gma_pci_ops,
 	.write_acpi_tables	= gma_write_acpi_tables,
 };
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 4637175ea1..b04344f17e 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -105,8 +105,6 @@ static const char *northbridge_acpi_name(const struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources = pci_domain_read_resources,
 	.set_resources = pci_domain_set_resources,
-	.enable_resources = NULL,
-	.init = NULL,
 	.scan_bus = pci_domain_scan_bus,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name = northbridge_acpi_name,
@@ -256,7 +254,6 @@ static struct device_operations mc_ops = {
 	.enable_resources = pci_dev_enable_resources,
 	.init = northbridge_init,
 	.acpi_fill_ssdt = generate_cpu_entries,
-	.scan_bus = 0,
 	.ops_pci = &intel_pci_ops,
 };
 
@@ -271,7 +268,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init = mp_cpu_bus_init,
-	.scan_bus = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index c0962d78f3..39ce5e6861 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -326,10 +326,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources         = pci_dev_read_resources,
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
-	.acpi_fill_ssdt		= NULL,
 	.init                   = gma_func0_init,
-	.scan_bus               = NULL,
-	.enable                 = NULL,
 	.ops_pci                = &gma_pci_ops,
 	.acpi_name              = gma_acpi_name,
 	.write_acpi_tables      = gma_write_acpi_tables,
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index b68e705b32..5c4f548f99 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -699,8 +699,6 @@ static struct device_operations gma_func0_ops = {
 	.enable_resources       = pci_dev_enable_resources,
 	.acpi_fill_ssdt		= gma_generate_ssdt,
 	.init                   = gma_func0_init,
-	.scan_bus               = NULL,
-	.enable                 = NULL,
 	.disable                = gma_func0_disable,
 	.ops_pci                = &gma_pci_ops,
 	.acpi_name              = gma_acpi_name,
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ff5d7f27ba..6ec36f7343 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -245,8 +245,6 @@ static const char *northbridge_acpi_name(const struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources    = pci_domain_read_resources,
 	.set_resources     = pci_domain_set_resources,
-	.enable_resources  = NULL,
-	.init              = NULL,
 	.scan_bus          = pci_domain_scan_bus,
 	.write_acpi_tables = northbridge_write_acpi_tables,
 	.acpi_name         = northbridge_acpi_name,
@@ -444,7 +442,6 @@ static struct device_operations mc_ops = {
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
 	.init                   = northbridge_init,
-	.scan_bus               = NULL,
 	.ops_pci                = &intel_pci_ops,
 	.acpi_fill_ssdt		= generate_cpu_entries,
 };
@@ -466,7 +463,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = mp_cpu_bus_init,
-	.scan_bus         = 0,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/soc/amd/picasso/northbridge.c b/src/soc/amd/picasso/northbridge.c
index 20589a95e3..b6e5d5c8a1 100644
--- a/src/soc/amd/picasso/northbridge.c
+++ b/src/soc/amd/picasso/northbridge.c
@@ -205,8 +205,6 @@ static struct device_operations northbridge_operations = {
 	.enable_resources = pci_dev_enable_resources,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const struct pci_driver family15_northbridge __pci_driver = {
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index afcd49824b..b853d5f287 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -358,8 +358,6 @@ static struct device_operations northbridge_operations = {
 	.init		  = northbridge_init,
 	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
-	.enable		  = 0,
-	.ops_pci	  = 0,
 };
 
 static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c
index 1f2ba843c6..777cd10967 100644
--- a/src/soc/cavium/cn81xx/ecam0.c
+++ b/src/soc/cavium/cn81xx/ecam0.c
@@ -320,8 +320,6 @@ static void ecam0_init(struct device *dev)
 }
 
 struct device_operations pci_domain_ops_ecam0 = {
-	.set_resources    = NULL,
-	.enable_resources = NULL,
 	.read_resources   = ecam0_read_resources,
 	.init             = ecam0_init,
 	.scan_bus         = pci_domain_scan_bus,
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index 02b7da6140..9312593fe6 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -394,7 +394,6 @@ static struct device_operations soc_ops = {
 	.enable_resources = DEVICE_NOOP,
 	.init             = soc_init,
 	.final            = soc_final,
-	.scan_bus         = NULL,
 };
 
 static void enable_soc_dev(struct device *dev)
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index ee533bb743..2c8737f654 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -214,8 +214,6 @@ static void pci_domain_set_resources(struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources = pci_domain_read_resources,
 	.set_resources = pci_domain_set_resources,
-	.enable_resources = NULL,
-	.init = NULL,
 	.scan_bus = pci_domain_scan_bus,
 	.acpi_name = &soc_acpi_name,
 };
@@ -225,7 +223,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init = apollolake_init_cpus,
-	.scan_bus = NULL,
 	.acpi_fill_ssdt = generate_cpu_entries,
 };
 
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index f65d4f251c..10bb245581 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -28,8 +28,6 @@ static void pci_domain_set_resources(struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources   = pci_domain_read_resources,
 	.set_resources    = pci_domain_set_resources,
-	.enable_resources = NULL,
-	.init             = NULL,
 	.scan_bus         = pci_domain_scan_bus,
 };
 
@@ -38,7 +36,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = baytrail_init_cpus,
-	.scan_bus         = NULL,
 };
 
 
diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c
index 8994e43af8..885bc0fbb1 100644
--- a/src/soc/intel/baytrail/emmc.c
+++ b/src/soc/intel/baytrail/emmc.c
@@ -59,8 +59,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= emmc_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index e8be1e2327..45430070d2 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -100,8 +100,6 @@ static const struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= hda_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/lpe.c b/src/soc/intel/baytrail/lpe.c
index e34af1e2d7..a2c71e62d8 100644
--- a/src/soc/intel/baytrail/lpe.c
+++ b/src/soc/intel/baytrail/lpe.c
@@ -173,8 +173,6 @@ static const struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= lpe_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/lpss.c b/src/soc/intel/baytrail/lpss.c
index 71b6dacbb5..9cc8025957 100644
--- a/src/soc/intel/baytrail/lpss.c
+++ b/src/soc/intel/baytrail/lpss.c
@@ -171,8 +171,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= lpss_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index 0b61fe7d05..38bbfc27ad 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -137,11 +137,6 @@ static void nc_read_resources(struct device *dev)
 static struct device_operations nc_ops = {
 	.read_resources   = nc_read_resources,
 	.acpi_fill_ssdt   = generate_cpu_entries,
-	.set_resources    = NULL,
-	.enable_resources = NULL,
-	.init             = NULL,
-	.enable           = NULL,
-	.scan_bus         = NULL,
 	.ops_pci          = &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/sata.c b/src/soc/intel/baytrail/sata.c
index 33fb04316b..f56975fd39 100644
--- a/src/soc/intel/baytrail/sata.c
+++ b/src/soc/intel/baytrail/sata.c
@@ -212,7 +212,6 @@ static struct device_operations sata_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sata_init,
 	.enable			= sata_enable,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c
index dd2b61ac7d..7c587650f9 100644
--- a/src/soc/intel/baytrail/sd.c
+++ b/src/soc/intel/baytrail/sd.c
@@ -50,8 +50,6 @@ static const struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sd_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index be58f42a58..06cb2619d5 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -523,7 +523,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.acpi_inject_dsdt	= southcluster_inject_dsdt,
 	.write_acpi_tables      = acpi_write_hpet,
-	.enable_resources	= NULL,
 	.init			= sc_init,
 	.enable			= southcluster_enable_dev,
 	.scan_bus		= scan_static_bus,
diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index 90ee850cd9..d63bb77dca 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -31,8 +31,6 @@ static void pci_domain_set_resources(struct device *dev)
 static struct device_operations pci_domain_ops = {
 	.read_resources   = pci_domain_read_resources,
 	.set_resources    = pci_domain_set_resources,
-	.enable_resources = NULL,
-	.init             = NULL,
 	.scan_bus         = pci_domain_scan_bus,
 };
 
diff --git a/src/soc/intel/braswell/lpe.c b/src/soc/intel/braswell/lpe.c
index 85e698c535..cf61120895 100644
--- a/src/soc/intel/braswell/lpe.c
+++ b/src/soc/intel/braswell/lpe.c
@@ -197,8 +197,6 @@ static const struct device_operations device_ops = {
 	.set_resources		= lpe_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= lpe_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/braswell/lpss.c b/src/soc/intel/braswell/lpss.c
index b5c4e3d95c..24377af311 100644
--- a/src/soc/intel/braswell/lpss.c
+++ b/src/soc/intel/braswell/lpss.c
@@ -162,8 +162,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= lpss_init,
-	.enable			= NULL,
-	.scan_bus		= NULL,
 	.ops_pci		= &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index aa054d6801..c166371091 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -572,7 +572,6 @@ void southcluster_enable_dev(struct device *dev)
 static struct device_operations device_ops = {
 	.read_resources			= sc_read_resources,
 	.set_resources			= pci_dev_set_resources,
-	.enable_resources		= NULL,
 	.acpi_inject_dsdt		= southcluster_inject_dsdt,
 	.write_acpi_tables		= southcluster_write_acpi_tables,
 	.init				= sc_init,
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index c41d857d88..d21f053b41 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -46,7 +46,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init = denverton_init_cpus,
-	.scan_bus = NULL,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_fill_ssdt = generate_cpu_entries,
 #endif
diff --git a/src/soc/intel/denverton_ns/csme_ie_kt.c b/src/soc/intel/denverton_ns/csme_ie_kt.c
index 73a680e2b9..a8d081af4c 100644
--- a/src/soc/intel/denverton_ns/csme_ie_kt.c
+++ b/src/soc/intel/denverton_ns/csme_ie_kt.c
@@ -69,8 +69,6 @@ static struct device_operations csme_ie_kt_ops = {
 	.read_resources = pci_csme_ie_kt_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.scan_bus = 0,
-	.init = 0,
 	.ops_pci = &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/denverton_ns/npk.c b/src/soc/intel/denverton_ns/npk.c
index ce57686e01..c22a5c2d40 100644
--- a/src/soc/intel/denverton_ns/npk.c
+++ b/src/soc/intel/denverton_ns/npk.c
@@ -37,7 +37,6 @@ static struct device_operations pmc_ops = {
 	.read_resources = pci_npk_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.scan_bus = 0,
 	.init = npk_init,
 	.ops_pci = &soc_pci_ops,
 };
diff --git a/src/soc/intel/denverton_ns/pmc.c b/src/soc/intel/denverton_ns/pmc.c
index 7027e1ed26..4094b0953a 100644
--- a/src/soc/intel/denverton_ns/pmc.c
+++ b/src/soc/intel/denverton_ns/pmc.c
@@ -104,7 +104,6 @@ static struct device_operations pmc_ops = {
 	.read_resources = pci_pmc_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.scan_bus = 0,
 	.init = pmc_init,
 	.ops_pci = &soc_pci_ops,
 };
diff --git a/src/soc/intel/denverton_ns/sata.c b/src/soc/intel/denverton_ns/sata.c
index 9097526619..9ee6254424 100644
--- a/src/soc/intel/denverton_ns/sata.c
+++ b/src/soc/intel/denverton_ns/sata.c
@@ -65,7 +65,6 @@ static struct device_operations sata_ops = {
 	.enable_resources = pci_dev_enable_resources,
 	.init = sata_init,
 	.enable = sata_enable,
-	.scan_bus = 0,
 	.ops_pci = &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/denverton_ns/xhci.c b/src/soc/intel/denverton_ns/xhci.c
index 7c6e88951a..be961de332 100644
--- a/src/soc/intel/denverton_ns/xhci.c
+++ b/src/soc/intel/denverton_ns/xhci.c
@@ -39,7 +39,6 @@ static struct device_operations usb_xhci_ops = {
 	.enable_resources = pci_dev_enable_resources,
 	.init = usb_xhci_init,
 	.enable = pci_dev_enable_resources,
-	.scan_bus = 0,
 	.ops_pci = &soc_pci_ops,
 };
 
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index e4063dc99d..ef18e45e9b 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -35,7 +35,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init = cpx_init_cpus,
-	.scan_bus = NULL,
 };
 
 static void chip_enable_dev(struct device *dev)
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 764e70fea6..90ae0252e2 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -486,7 +486,6 @@ static struct device_operations cpu_bus_ops = {
 	.set_resources = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init = xeon_sp_init_cpus,
-	.scan_bus = NULL,
 #if CONFIG(HAVE_ACPI_TABLES)
 	/* defined in src/soc/intel/common/block/acpi/acpi.c */
 	.acpi_fill_ssdt = generate_cpu_entries,
diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c
index f549eecd85..670d62a5a5 100644
--- a/src/soc/intel/xeon_sp/uncore.c
+++ b/src/soc/intel/xeon_sp/uncore.c
@@ -287,9 +287,6 @@ static struct device_operations mmapvtd_ops = {
 	.enable_resources  = pci_dev_enable_resources,
 	.init              = mmapvtd_init,
 	.ops_pci           = &soc_pci_ops,
-#if CONFIG(HAVE_ACPI_TABLES)
-	.acpi_inject_dsdt  = NULL,
-#endif
 };
 
 static const unsigned short mmapvtd_ids[] = {
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index f2e2c0a00c..d291af8ad6 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -57,7 +57,6 @@ static struct device_operations soc_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = soc_enable,
 	.init             = soc_init,
-	.scan_bus         = 0,
 };
 
 static void enable_tegra124_dev(struct device *dev)
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index c29a810ee6..22b6dfe497 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -65,7 +65,6 @@ static struct device_operations soc_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init             = DEVICE_NOOP,
-	.scan_bus         = NULL,
 };
 
 static void enable_tegra210_dev(struct device *dev)
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index 09cd7bcf87..84fa691b2b 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -38,7 +38,6 @@ static struct device_operations soc_ops = {
 	.read_resources   = DEVICE_NOOP,
 	.set_resources    = DEVICE_NOOP,
 	.init             = soc_init,
-	.scan_bus         = 0,
 };
 
 static void enable_rk3288_dev(struct device *dev)
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index 4523964775..989af5962c 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -127,7 +127,6 @@ static struct device_operations cpu_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
-	.scan_bus         = 0,
 };
 
 static void enable_exynos5250_dev(struct device *dev)
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index bcc6878de7..cc6b0480a9 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -157,7 +157,6 @@ static struct device_operations cpu_ops = {
 	.set_resources    = DEVICE_NOOP,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
-	.scan_bus         = 0,
 };
 
 static void enable_exynos5420_dev(struct device *dev)
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index d03694c2ab..40f1fa6ef2 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -20,7 +20,6 @@ static struct device_operations hda_audio_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = hda_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index 76e5ead8e4..f8765c7dd7 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -19,7 +19,6 @@ static struct device_operations ide_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = ide_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c
index fcf27c63c8..af4b2a523c 100644
--- a/src/southbridge/amd/agesa/hudson/sata.c
+++ b/src/southbridge/amd/agesa/hudson/sata.c
@@ -49,7 +49,6 @@ static struct device_operations sata_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = sata_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/agesa/hudson/sd.c b/src/southbridge/amd/agesa/hudson/sd.c
index 3d5eb29f50..4bd08a912d 100644
--- a/src/southbridge/amd/agesa/hudson/sd.c
+++ b/src/southbridge/amd/agesa/hudson/sd.c
@@ -43,7 +43,6 @@ static struct device_operations sd_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = sd_init,
-	.scan_bus = 0,
 };
 
 static const struct pci_driver sd_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index 2657555964..60716c7222 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -20,7 +20,6 @@ static struct device_operations usb_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = usb_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index babc21ef3f..e4a1795ab4 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -170,7 +170,6 @@ static struct device_operations sata_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = ahci_raid_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
@@ -195,8 +194,6 @@ static struct device_operations usb_ops = {
 	.read_resources = pci_ehci_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
@@ -226,8 +223,6 @@ static struct device_operations azalia_ops = {
 	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
@@ -242,8 +237,6 @@ static struct device_operations gec_ops = {
 	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.init = 0,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index ef2a341ea6..f49e5fa6fe 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -26,7 +26,6 @@ static struct device_operations hda_audio_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = hda_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index 76e5ead8e4..f8765c7dd7 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.c
@@ -19,7 +19,6 @@ static struct device_operations ide_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = ide_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c
index 4a210d709d..ba1c54fe00 100644
--- a/src/southbridge/amd/pi/hudson/sata.c
+++ b/src/southbridge/amd/pi/hudson/sata.c
@@ -49,7 +49,6 @@ static struct device_operations sata_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = sata_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/amd/pi/hudson/sd.c b/src/southbridge/amd/pi/hudson/sd.c
index 0a9baffdda..0dbef81162 100644
--- a/src/southbridge/amd/pi/hudson/sd.c
+++ b/src/southbridge/amd/pi/hudson/sd.c
@@ -44,7 +44,6 @@ static struct device_operations sd_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = sd_init,
-	.scan_bus = 0,
 };
 
 static const struct pci_driver sd_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index c882556b75..12b0754896 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -20,7 +20,6 @@ static struct device_operations usb_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = usb_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 316fafcab4..0466d3109c 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -333,7 +333,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_pci_ops,
 	.acpi_name		= azalia_acpi_name,
 };
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index e09e07246b..e04f3bacc9 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -246,7 +246,6 @@ static struct device_operations sata_ops = {
 	.acpi_fill_ssdt		= sata_fill_ssdt,
 	.init			= sata_init,
 	.enable			= sata_enable,
-	.scan_bus		= 0,
 	.ops_pci		= &sata_pci_ops,
 	.acpi_name		= sata_acpi_name,
 };
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index 1d7120dc09..b9069376d7 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -97,7 +97,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_ehci_init,
-	.scan_bus		= 0,
 	.ops_pci		= &lops_pci,
 	.acpi_name		= usb_ehci_acpi_name,
 };
diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index 8696d59abf..a562db2e52 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -53,7 +53,6 @@ static struct device_operations usb_xhci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_xhci_init,
-	.scan_bus		= 0,
 	.ops_pci		= &xhci_pci_ops,
 	.acpi_name		= xhci_acpi_name,
 };
diff --git a/src/southbridge/intel/i82371eb/ide.c b/src/southbridge/intel/i82371eb/ide.c
index b21887f8d9..40e74e93ab 100644
--- a/src/southbridge/intel/i82371eb/ide.c
+++ b/src/southbridge/intel/i82371eb/ide.c
@@ -146,8 +146,6 @@ static const struct device_operations ide_ops_fb_sb = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= ide_init_i82371fb_sb,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= 0, /* No subsystem IDs on 82371XX! */
 };
 
@@ -157,8 +155,6 @@ static const struct device_operations ide_ops_ab_eb_mb = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= ide_init_i82371ab_eb_mb,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= 0, /* No subsystem IDs on 82371XX! */
 };
 
diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c
index 7fe243f1d5..bb876115a3 100644
--- a/src/southbridge/intel/i82371eb/isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
@@ -135,7 +135,6 @@ static const struct device_operations isa_ops = {
 #endif
 	.init			= isa_init,
 	.scan_bus		= scan_static_bus,
-	.enable			= 0,
 	.ops_pci		= 0, /* No subsystem IDs on 82371EB! */
 };
 
diff --git a/src/southbridge/intel/i82371eb/smbus.c b/src/southbridge/intel/i82371eb/smbus.c
index f9690c34ad..d74879d0b6 100644
--- a/src/southbridge/intel/i82371eb/smbus.c
+++ b/src/southbridge/intel/i82371eb/smbus.c
@@ -113,7 +113,6 @@ static const struct device_operations smbus_ops = {
 	.read_resources		= pwrmgt_read_resources,
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
-	.init			= 0,
 	.scan_bus		= scan_smbus,
 	.enable			= pwrmgt_enable,
 	.ops_pci		= 0, /* No subsystem IDs on 82371EB! */
diff --git a/src/southbridge/intel/i82371eb/usb.c b/src/southbridge/intel/i82371eb/usb.c
index d4fffa4619..4fcd26cc98 100644
--- a/src/southbridge/intel/i82371eb/usb.c
+++ b/src/southbridge/intel/i82371eb/usb.c
@@ -37,8 +37,6 @@ static const struct device_operations usb_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_init,
-	.scan_bus		= 0,
-	.enable			= 0,
 	.ops_pci		= 0, /* No subsystem IDs on 82371EB! */
 };
 
diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c
index b0fda29665..9e6d51a500 100644
--- a/src/southbridge/intel/i82801dx/ac97.c
+++ b/src/southbridge/intel/i82801dx/ac97.c
@@ -241,7 +241,6 @@ static struct device_operations ac97_audio_ops  = {
 	.enable_resources = pci_dev_enable_resources,
 	.enable           = i82801dx_enable,
 	.init             = ac97_audio_init,
-	.scan_bus         = 0,
 };
 
 static struct device_operations ac97_modem_ops  = {
@@ -250,7 +249,6 @@ static struct device_operations ac97_modem_ops  = {
 	.enable_resources = pci_dev_enable_resources,
 	.enable           = i82801dx_enable,
 	.init             = ac97_modem_init,
-	.scan_bus         = 0,
 };
 
 /* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */
diff --git a/src/southbridge/intel/i82801dx/ide.c b/src/southbridge/intel/i82801dx/ide.c
index 0c8408ca99..8150de775e 100644
--- a/src/southbridge/intel/i82801dx/ide.c
+++ b/src/southbridge/intel/i82801dx/ide.c
@@ -47,7 +47,6 @@ static struct device_operations ide_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = ide_init,
-	.scan_bus = 0,
 	.enable = i82801dx_enable,
 };
 
diff --git a/src/southbridge/intel/i82801dx/usb.c b/src/southbridge/intel/i82801dx/usb.c
index f02d70808e..68dc1a6c3c 100644
--- a/src/southbridge/intel/i82801dx/usb.c
+++ b/src/southbridge/intel/i82801dx/usb.c
@@ -24,7 +24,6 @@ static struct device_operations usb_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = usb_init,
-	.scan_bus = 0,
 	.enable = i82801dx_enable,
 };
 
diff --git a/src/southbridge/intel/i82801dx/usb2.c b/src/southbridge/intel/i82801dx/usb2.c
index 53fece054a..cc25d23a98 100644
--- a/src/southbridge/intel/i82801dx/usb2.c
+++ b/src/southbridge/intel/i82801dx/usb2.c
@@ -25,7 +25,6 @@ static struct device_operations usb2_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = usb2_init,
-	.scan_bus = 0,
 	.enable = i82801dx_enable,
 };
 
diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index ad7c636312..3833e72fdb 100644
--- a/src/southbridge/intel/i82801gx/ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
@@ -243,7 +243,6 @@ static struct device_operations ac97_audio_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= ac97_audio_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &ac97_pci_ops,
 };
@@ -253,7 +252,6 @@ static struct device_operations ac97_modem_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= ac97_modem_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &ac97_pci_ops,
 };
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index 737a2db6c1..a701c47a81 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -300,7 +300,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &azalia_pci_ops,
 };
diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c
index 16236c1ffb..b6b30efea9 100644
--- a/src/southbridge/intel/i82801gx/ide.c
+++ b/src/southbridge/intel/i82801gx/ide.c
@@ -89,7 +89,6 @@ static struct device_operations ide_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= ide_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &ide_pci_ops,
 };
diff --git a/src/southbridge/intel/i82801gx/nic.c b/src/southbridge/intel/i82801gx/nic.c
index 899d1d23d8..498ed3ec27 100644
--- a/src/southbridge/intel/i82801gx/nic.c
+++ b/src/southbridge/intel/i82801gx/nic.c
@@ -17,7 +17,6 @@ static struct device_operations nic_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= nic_init,
-	.scan_bus		= 0,
 };
 
 /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c
index 95d0482aac..533cfef9a4 100644
--- a/src/southbridge/intel/i82801gx/sata.c
+++ b/src/southbridge/intel/i82801gx/sata.c
@@ -227,7 +227,6 @@ static struct device_operations sata_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sata_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &sata_pci_ops,
 };
diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c
index 0e85b1c1eb..8a8b58cb88 100644
--- a/src/southbridge/intel/i82801gx/usb.c
+++ b/src/southbridge/intel/i82801gx/usb.c
@@ -39,7 +39,6 @@ static struct device_operations usb_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &usb_pci_ops,
 };
diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c
index 399b166c37..0efae6daca 100644
--- a/src/southbridge/intel/i82801gx/usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/usb_ehci.c
@@ -71,7 +71,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_ehci_init,
-	.scan_bus		= 0,
 	.enable			= i82801gx_enable,
 	.ops_pci		= &lops_pci,
 };
diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c
index 364ffe4e56..e5b790619f 100644
--- a/src/southbridge/intel/i82801ix/hdaudio.c
+++ b/src/southbridge/intel/i82801ix/hdaudio.c
@@ -283,7 +283,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c
index b6b72e3c1b..898117304d 100644
--- a/src/southbridge/intel/i82801ix/sata.c
+++ b/src/southbridge/intel/i82801ix/sata.c
@@ -258,7 +258,6 @@ static struct device_operations sata_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sata_init,
 	.enable			= sata_enable,
-	.scan_bus		= 0,
 	.ops_pci		= &sata_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c
index dce393f042..9fd98a12bc 100644
--- a/src/southbridge/intel/i82801ix/thermal.c
+++ b/src/southbridge/intel/i82801ix/thermal.c
@@ -46,7 +46,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= thermal_init,
-	.scan_bus		= 0,
 	.ops_pci		= &thermal_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801ix/usb_ehci.c b/src/southbridge/intel/i82801ix/usb_ehci.c
index 14996165be..3ccffd8228 100644
--- a/src/southbridge/intel/i82801ix/usb_ehci.c
+++ b/src/southbridge/intel/i82801ix/usb_ehci.c
@@ -52,7 +52,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_ehci_init,
-	.scan_bus		= 0,
 	.ops_pci		= &lops_pci,
 };
 
diff --git a/src/southbridge/intel/i82801jx/hdaudio.c b/src/southbridge/intel/i82801jx/hdaudio.c
index 0d93415501..1711de9ae3 100644
--- a/src/southbridge/intel/i82801jx/hdaudio.c
+++ b/src/southbridge/intel/i82801jx/hdaudio.c
@@ -283,7 +283,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c
index 56ed7708e3..9578b9411d 100644
--- a/src/southbridge/intel/i82801jx/sata.c
+++ b/src/southbridge/intel/i82801jx/sata.c
@@ -252,7 +252,6 @@ static struct device_operations sata_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sata_init,
 	.enable			= sata_enable,
-	.scan_bus		= 0,
 	.ops_pci		= &sata_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c
index 28d4c7b688..ab5560f69f 100644
--- a/src/southbridge/intel/i82801jx/thermal.c
+++ b/src/southbridge/intel/i82801jx/thermal.c
@@ -46,7 +46,6 @@ static struct device_operations device_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= thermal_init,
-	.scan_bus		= 0,
 	.ops_pci		= &thermal_pci_ops,
 };
 
diff --git a/src/southbridge/intel/i82801jx/usb_ehci.c b/src/southbridge/intel/i82801jx/usb_ehci.c
index 551aa500df..03b314a10d 100644
--- a/src/southbridge/intel/i82801jx/usb_ehci.c
+++ b/src/southbridge/intel/i82801jx/usb_ehci.c
@@ -54,7 +54,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_ehci_init,
-	.scan_bus		= 0,
 	.ops_pci		= &lops_pci,
 };
 
diff --git a/src/southbridge/intel/i82870/ioapic.c b/src/southbridge/intel/i82870/ioapic.c
index c7b189ac77..9947cbd5e1 100644
--- a/src/southbridge/intel/i82870/ioapic.c
+++ b/src/southbridge/intel/i82870/ioapic.c
@@ -87,7 +87,6 @@ static struct device_operations ioapic_ops = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init     = p64h2_ioapic_init,
-	.scan_bus = 0,
 	.enable   = p64h2_ioapic_enable,
 };
 
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 8a442a1c68..eb75b1200d 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -308,7 +308,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_pci_ops,
 };
 
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index e6fcde60c9..3a7bdb605f 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -229,7 +229,6 @@ static struct device_operations sata_ops = {
 	.init = sata_init,
 	.enable = sata_enable,
 	.acpi_fill_ssdt = sata_fill_ssdt,
-	.scan_bus = 0,
 	.ops_pci = &sata_pci_ops,
 };
 
diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c
index 3f0b7bf07b..298016f39a 100644
--- a/src/southbridge/intel/ibexpeak/thermal.c
+++ b/src/southbridge/intel/ibexpeak/thermal.c
@@ -40,7 +40,6 @@ static struct device_operations thermal_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = thermal_init,
-	.scan_bus = 0,
 	.ops_pci = &pci_ops,
 };
 
diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c
index f513628802..40ba75811d 100644
--- a/src/southbridge/intel/ibexpeak/usb_ehci.c
+++ b/src/southbridge/intel/ibexpeak/usb_ehci.c
@@ -80,7 +80,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources = pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init = usb_ehci_init,
-	.scan_bus = 0,
 	.ops_pci = &lops_pci,
 };
 
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index b24740bb73..cbdd3f6ee9 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -149,7 +149,6 @@ static struct device_operations azalia_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= azalia_init,
-	.scan_bus		= 0,
 	.ops_pci		= &azalia_pci_ops,
 };
 
diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c
index 22be4d169d..922aef0c00 100644
--- a/src/southbridge/intel/lynxpoint/sata.c
+++ b/src/southbridge/intel/lynxpoint/sata.c
@@ -321,7 +321,6 @@ static struct device_operations sata_ops = {
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= sata_init,
 	.enable			= sata_enable,
-	.scan_bus		= 0,
 	.ops_pci		= &sata_pci_ops,
 };
 
diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c
index 681d098374..ce81f76f44 100644
--- a/src/southbridge/intel/lynxpoint/usb_ehci.c
+++ b/src/southbridge/intel/lynxpoint/usb_ehci.c
@@ -177,7 +177,6 @@ static struct device_operations usb_ehci_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= usb_ehci_init,
-	.scan_bus		= 0,
 	.ops_pci		= &lops_pci,
 };
 
diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c
index c07e76439b..df9456e1d4 100644
--- a/src/southbridge/ti/pci1x2x/pci1x2x.c
+++ b/src/southbridge/ti/pci1x2x/pci1x2x.c
@@ -58,7 +58,6 @@ struct device_operations southbridge_ti_pci1x2x_pciops = {
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = cardbus_enable_resources,
 	.init             = ti_pci1x2y_init,
-	.scan_bus         = 0,
 	.ops_pci          = &ti_pci1x2y_pci_ops,
 };