Change in coreboot[master]: src: Use pci_dev_ops_pci where applicable

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

src: Use pci_dev_ops_pci where applicable

Change-Id: Ie004a94a49fc8f53c370412bee1c3e7eacbf8beb
Signed-off-by: Angel Pons 
---
M src/device/azalia_device.c
M src/drivers/generic/bayhub/bh720.c
M src/drivers/intel/wifi/wifi.c
M src/northbridge/amd/agesa/family15tn/iommu.c
M src/northbridge/amd/pi/00630F01/iommu.c
M src/northbridge/amd/pi/00730F01/iommu.c
M src/northbridge/intel/e7505/northbridge.c
M src/northbridge/intel/gm45/gma.c
M src/northbridge/intel/haswell/gma.c
M src/northbridge/intel/haswell/minihd.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/haswell/pcie.c
M src/northbridge/intel/i945/gma.c
M src/northbridge/intel/i945/northbridge.c
M src/northbridge/intel/ironlake/gma.c
M src/northbridge/intel/ironlake/northbridge.c
M src/northbridge/intel/pineview/gma.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/northbridge.c
M src/northbridge/intel/sandybridge/pcie.c
M src/northbridge/intel/x4x/gma.c
M src/soc/amd/common/block/iommu/iommu.c
M src/soc/amd/common/block/smbus/sm.c
M src/soc/amd/picasso/acp.c
M src/soc/amd/picasso/usb.c
M src/soc/amd/stoneyridge/usb.c
M src/soc/intel/baytrail/pcie.c
M src/soc/intel/braswell/pcie.c
M src/southbridge/amd/agesa/hudson/hda.c
M src/southbridge/amd/agesa/hudson/ide.c
M src/southbridge/amd/agesa/hudson/lpc.c
M src/southbridge/amd/agesa/hudson/sm.c
M src/southbridge/amd/agesa/hudson/usb.c
M src/southbridge/amd/cimx/sb800/late.c
M src/southbridge/amd/pi/hudson/hda.c
M src/southbridge/amd/pi/hudson/ide.c
M src/southbridge/amd/pi/hudson/lpc.c
M src/southbridge/amd/pi/hudson/sm.c
M src/southbridge/amd/pi/hudson/usb.c
M src/southbridge/intel/bd82x6x/azalia.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/bd82x6x/me.c
M src/southbridge/intel/bd82x6x/me_8.x.c
M src/southbridge/intel/bd82x6x/pci.c
M src/southbridge/intel/bd82x6x/pcie.c
M src/southbridge/intel/bd82x6x/sata.c
M src/southbridge/intel/bd82x6x/smbus.c
M src/southbridge/intel/bd82x6x/usb_xhci.c
M src/southbridge/intel/i82801gx/ac97.c
M src/southbridge/intel/i82801gx/azalia.c
M src/southbridge/intel/i82801gx/ide.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801gx/pci.c
M src/southbridge/intel/i82801gx/pcie.c
M src/southbridge/intel/i82801gx/sata.c
M src/southbridge/intel/i82801gx/smbus.c
M src/southbridge/intel/i82801gx/usb.c
M src/southbridge/intel/i82801gx/usb_ehci.c
M src/southbridge/intel/i82801ix/hdaudio.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801ix/pci.c
M src/southbridge/intel/i82801ix/pcie.c
M src/southbridge/intel/i82801ix/sata.c
M src/southbridge/intel/i82801ix/smbus.c
M src/southbridge/intel/i82801ix/thermal.c
M src/southbridge/intel/i82801jx/hdaudio.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/i82801jx/pci.c
M src/southbridge/intel/i82801jx/pcie.c
M src/southbridge/intel/i82801jx/sata.c
M src/southbridge/intel/i82801jx/smbus.c
M src/southbridge/intel/i82801jx/thermal.c
M src/southbridge/intel/ibexpeak/azalia.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/ibexpeak/me.c
M src/southbridge/intel/ibexpeak/sata.c
M src/southbridge/intel/ibexpeak/smbus.c
M src/southbridge/intel/ibexpeak/thermal.c
M src/southbridge/intel/ibexpeak/usb_ehci.c
M src/southbridge/intel/lynxpoint/azalia.c
M src/southbridge/intel/lynxpoint/lpc.c
M src/southbridge/intel/lynxpoint/me_9.x.c
M src/southbridge/intel/lynxpoint/pcie.c
M src/southbridge/intel/lynxpoint/sata.c
M src/southbridge/intel/lynxpoint/serialio.c
M src/southbridge/intel/lynxpoint/smbus.c
M src/southbridge/intel/lynxpoint/usb_xhci.c
87 files changed, 89 insertions(+), 435 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/41944/1

diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index dca4e0a..1e0cf2f 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -241,14 +241,10 @@
    }
 }

-struct pci_operations azalia_audio_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 struct device_operations default_azalia_audio_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= azalia_audio_init,
-	.ops_pci		= &azalia_audio_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };
diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c
index 98193b0..cdac9fe 100644
--- a/src/drivers/generic/bayhub/bh720.c
+++ b/src/drivers/generic/bayhub/bh720.c
@@ -46,15 +46,11 @@
    board_bh720(dev);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations bh720_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .init			= bh720_init,
 };

diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index 2dd3543..9fcd7ba 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -73,10 +73,6 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 struct device_operations device_ops = {
    .read_resources   = pci_dev_read_resources,
    .set_resources    = pci_dev_set_resources,
@@ -85,7 +81,7 @@
 #if CONFIG(GENERATE_SMBIOS_TABLES)
    .get_smbios_data  = smbios_write_wifi,
 #endif
-	.ops_pci          = &pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name        = generic_wifi_acpi_name,
    .acpi_fill_ssdt   = intel_wifi_fill_ssdt,
diff --git a/src/northbridge/amd/agesa/family15tn/iommu.c b/src/northbridge/amd/agesa/family15tn/iommu.c
index a7adfee..7af6538 100644
--- a/src/northbridge/amd/agesa/family15tn/iommu.c
+++ b/src/northbridge/amd/agesa/family15tn/iommu.c
@@ -36,15 +36,11 @@
    pci_write_config32(dev, 0x44, res->base | (1 << 0));
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/amd/pi/00630F01/iommu.c b/src/northbridge/amd/pi/00630F01/iommu.c
index 08486cc..0902243 100644
--- a/src/northbridge/amd/pi/00630F01/iommu.c
+++ b/src/northbridge/amd/pi/00630F01/iommu.c
@@ -36,15 +36,11 @@
    pci_write_config32(dev, 0x44, res->base | (1 << 0));
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/amd/pi/00730F01/iommu.c b/src/northbridge/amd/pi/00730F01/iommu.c
index fa0932a..ef478dd 100644
--- a/src/northbridge/amd/pi/00730F01/iommu.c
+++ b/src/northbridge/amd/pi/00730F01/iommu.c
@@ -26,15 +26,11 @@
    pci_dev_set_resources(dev);
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index ee6ec5a..fc771b3 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -61,15 +61,11 @@
    assign_resources(dev->link_list);
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations pci_domain_ops = {
    .read_resources   = mch_domain_read_resources,
    .set_resources    = mch_domain_set_resources,
    .scan_bus         = pci_domain_scan_bus,
-	.ops_pci          = &intel_pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 };

static void cpu_bus_init(struct device *dev)
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 6a51dae..3d48ca2 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -200,17 +200,13 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= gma_acpi_name,
 };

diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 19341d4..68072ff 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -502,17 +502,13 @@
    drivers_intel_gma_displays_ssdt_generate(&chip->gfx);
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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,
    .init			= gma_func0_init,
    .acpi_fill_ssdt		= gma_generate_ssdt,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index f8a16e2..71ca1e6 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -85,16 +85,12 @@
    }
 }

-static struct pci_operations minihd_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations minihd_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= minihd_init,
-	.ops_pci		= &minihd_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x0a0c, 0x0c0c, 0 };
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index a728e0e..7d105da 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -448,17 +448,13 @@
    MCHBAR32(MMIO_PAVP_MSG) = 0x00100001;
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources         = mc_read_resources,
    .set_resources          = pci_dev_set_resources,
    .enable_resources       = pci_dev_enable_resources,
    .init                   = northbridge_init,
    .acpi_fill_ssdt		= generate_cpu_entries,
-	.ops_pci                = &intel_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
 };

static const unsigned short mc_pci_device_ids[] = {
diff --git a/src/northbridge/intel/haswell/pcie.c b/src/northbridge/intel/haswell/pcie.c
index 74f11dd..a47a2f5 100644
--- a/src/northbridge/intel/haswell/pcie.c
+++ b/src/northbridge/intel/haswell/pcie.c
@@ -47,10 +47,6 @@
 }
 #endif

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -59,7 +55,7 @@
    .reset_bus		= pci_bus_reset,
    .disable		= pcie_disable,
    .init			= pci_dev_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name		= pcie_acpi_name,
 #endif
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 183c8f5..34d129d 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -746,10 +746,6 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources		= gma_func0_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -757,7 +753,7 @@
    .init			= gma_func0_init,
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .disable		= gma_func0_disable,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= gma_acpi_name,
 };

@@ -767,7 +763,7 @@
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= gma_func1_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short i945_gma_func0_ids[] = {
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 56cad7a..0e8ea7e 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -174,16 +174,12 @@
    }
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources   = mc_read_resources,
    .set_resources    = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .acpi_fill_ssdt   = generate_cpu_entries,
-	.ops_pci          = &intel_pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c
index 5ccf8a6..8baccb2 100644
--- a/src/northbridge/intel/ironlake/gma.c
+++ b/src/northbridge/intel/ironlake/gma.c
@@ -191,17 +191,13 @@
    drivers_intel_gma_displays_ssdt_generate(&chip->gfx);
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources		= gma_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index d98af9e..f53b03e 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -227,17 +227,13 @@

}

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources = mc_read_resources,
    .set_resources = mc_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = northbridge_init,
    .acpi_fill_ssdt = generate_cpu_entries,
-	.ops_pci = &intel_pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver mc_driver_ard __pci_driver = {
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index 2f4b629..e46bd7c 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -263,16 +263,12 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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,
    .init                   = gma_func0_init,
-	.ops_pci                = &gma_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_name              = gma_acpi_name,
 };

diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 150b61c..aa66f4a 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -646,10 +646,6 @@
    dev->enabled = 0;
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources         = pci_dev_read_resources,
    .set_resources          = pci_dev_set_resources,
@@ -657,7 +653,7 @@
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .init                   = gma_func0_init,
    .disable                = gma_func0_disable,
-	.ops_pci                = &gma_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_name              = gma_acpi_name,
 };

diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ce28c05..1d20a4b 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -425,16 +425,12 @@
    pci_write_config8(pcidev_on_root(0, 0), SMRAM, smram);
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources         = mc_read_resources,
    .set_resources          = pci_dev_set_resources,
    .enable_resources       = pci_dev_enable_resources,
    .init                   = northbridge_init,
-	.ops_pci                = &intel_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_fill_ssdt		= generate_cpu_entries,
 };

diff --git a/src/northbridge/intel/sandybridge/pcie.c b/src/northbridge/intel/sandybridge/pcie.c
index f2b75d6..d0b7fd5 100644
--- a/src/northbridge/intel/sandybridge/pcie.c
+++ b/src/northbridge/intel/sandybridge/pcie.c
@@ -50,10 +50,6 @@
 }
 #endif

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -62,7 +58,7 @@
    .reset_bus		= pci_bus_reset,
    .disable		= pcie_disable,
    .init			= pci_dev_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name		= pcie_acpi_name,
 #endif
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index ecbd63e..d2d2bb0 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -67,17 +67,13 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .disable		= gma_func0_disable,
    .acpi_name		= gma_acpi_name,
 };
diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c
index bf0b600..c870972 100644
--- a/src/soc/amd/common/block/iommu/iommu.c
+++ b/src/soc/amd/common/block/iommu/iommu.c
@@ -21,15 +21,11 @@
    res->flags = IORESOURCE_MEM;
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index 2f37a91..c7e5e1e 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -71,16 +71,13 @@
    .write_byte = lsmbus_write_byte,
 };

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = noop_read_resources,
    .set_resources = noop_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/picasso/acp.c
index e0b369d..cbe5d86 100644
--- a/src/soc/amd/picasso/acp.c
+++ b/src/soc/amd/picasso/acp.c
@@ -41,15 +41,11 @@
    	sb_clk_output_48Mhz(); /* Internal connection to I2S */
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations acp_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = enable,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver acp_driver __pci_driver = {
diff --git a/src/soc/amd/picasso/usb.c b/src/soc/amd/picasso/usb.c
index a507956..7b8c18c 100644
--- a/src/soc/amd/picasso/usb.c
+++ b/src/soc/amd/picasso/usb.c
@@ -18,10 +18,6 @@
    printk(BIOS_DEBUG, "%s\n", __func__);
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -29,7 +25,7 @@
    .init = picasso_usb_init,
    .scan_bus = scan_static_bus,
    .acpi_name = soc_acpi_name,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c
index 921823a..c83f1e1 100644
--- a/src/soc/amd/stoneyridge/usb.c
+++ b/src/soc/amd/stoneyridge/usb.c
@@ -41,10 +41,6 @@
    return -1;
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources = pci_ehci_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -52,7 +48,7 @@
    .init = set_usb_over_current,
    .scan_bus = scan_static_bus,
    .acpi_name = soc_acpi_name,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/baytrail/pcie.c b/src/soc/intel/baytrail/pcie.c
index bac8d58..c257ce0 100644
--- a/src/soc/intel/baytrail/pcie.c
+++ b/src/soc/intel/baytrail/pcie.c
@@ -227,10 +227,6 @@
    do_pci_scan_bridge(dev, pciexp_scan_bus);
 }

-static struct pci_operations pcie_root_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -238,7 +234,7 @@
    .init			= byt_pcie_init,
    .scan_bus		= byt_pciexp_scan_bridge,
    .enable			= byt_pcie_enable,
-	.ops_pci		= &pcie_root_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/braswell/pcie.c b/src/soc/intel/braswell/pcie.c
index d8e423b..c0cf5e4 100644
--- a/src/soc/intel/braswell/pcie.c
+++ b/src/soc/intel/braswell/pcie.c
@@ -142,10 +142,6 @@
    southcluster_enable_dev(dev);
 }

-static struct pci_operations pcie_root_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -153,7 +149,7 @@
    .init			= pcie_init,
    .scan_bus		= pciexp_scan_bridge,
    .enable			= pcie_enable,
-	.ops_pci		= &pcie_root_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 094da2a..a15b045 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -10,16 +10,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations hda_audio_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = hda_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -9,16 +9,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = ide_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 8a1f250..89c9a6b 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -333,10 +333,6 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations lpc_ops = {
    .read_resources = hudson_lpc_read_resources,
    .set_resources = hudson_lpc_set_resources,
@@ -347,7 +343,7 @@
    .init = lpc_init,
    .final = lpc_final,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };
 static const struct pci_driver lpc_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 9f14908..b8511fa 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -130,16 +130,13 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = hudson_sm_read_resources,
    .set_resources = hudson_sm_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index ff691cf..1175f08 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -6,10 +6,6 @@
 #include <device/pci_ehci.h>
 #include "hudson.h"

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void usb_init(struct device *dev)
 {
 }
@@ -19,7 +15,7 @@
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = usb_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver usb_0_driver __pci_driver = {
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index 1cf3ae8..e3ba4a5 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -102,10 +102,6 @@
    printk(BIOS_DEBUG, "AHCI/RAID controller initialized\n");
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void lpc_init(struct device *dev)
 {
    printk(BIOS_DEBUG, "SB800 - Late.c - %s - Start.\n", __func__);
@@ -154,7 +150,7 @@
 #endif
    .init = lpc_init,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };

diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index 3c98c66..f11eee5 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -16,16 +16,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations hda_audio_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = hda_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.c
@@ -9,16 +9,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = ide_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index ebc9de5..c884f20 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -349,10 +349,6 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations lpc_ops = {
    .read_resources = hudson_lpc_read_resources,
    .set_resources = hudson_lpc_set_resources,
@@ -363,7 +359,7 @@
    .init = lpc_init,
    .final = lpc_final,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };

diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index ee30b7f..cba2d80 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -95,16 +95,13 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = hudson_sm_read_resources,
    .set_resources = hudson_sm_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index 3318349..fecae74 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -6,10 +6,6 @@
 #include <device/pci_ehci.h>
 #include "hudson.h"

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void usb_init(struct device *dev)
 {
 }
@@ -19,7 +15,7 @@
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = usb_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 0b460d9b..2ed88c2 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -323,16 +323,12 @@
    return "HDEF";
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= azalia_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 55e2573..89327b4 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -861,10 +861,6 @@
    	memcpy(spi_config, &config->spi, sizeof(*spi_config));
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -877,7 +873,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index e1a1edc..9557094 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -711,16 +711,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver intel_me __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 56303e1..79e542b 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -669,16 +669,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver intel_me __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index 6b36a4b..e61c60c 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -44,17 +44,13 @@
    pci_write_config16(dev, SECSTS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver pch_pci __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index 15c79ba..c32738e 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -294,10 +294,6 @@
    return NULL;
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -306,7 +302,7 @@
    .enable			= pch_pcie_enable,
    .scan_bus		= pch_pciexp_scan_bridge,
    .acpi_name		= pch_pcie_acpi_name,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16,
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index 27b4d16..1974e2b 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -279,10 +279,6 @@
    generate_sata_ssdt_ports("\_SB_.PCI0.SATA", config->sata_port_map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= sata_read_resources,
    .set_resources		= sata_set_resources,
@@ -290,7 +286,7 @@
    .acpi_fill_ssdt		= sata_fill_ssdt,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= sata_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 6e5be9b..1b72ea5 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -56,10 +56,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -85,7 +81,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= smbus_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index db925e0..5a5b418 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -43,16 +43,12 @@
    return "XHC";
 }

-static struct pci_operations xhci_pci_ops = {
-	.set_subsystem		= pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_xhci_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_xhci_init,
-	.ops_pci		= &xhci_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= xhci_acpi_name,
 };

diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index 67426c7..cc6e376 100644
--- a/src/southbridge/intel/i82801gx/ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
@@ -234,17 +234,13 @@
    }
 }

-static struct pci_operations ac97_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations ac97_audio_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= ac97_audio_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ac97_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static struct device_operations ac97_modem_ops = {
@@ -253,7 +249,7 @@
    .enable_resources	= pci_dev_enable_resources,
    .init			= ac97_modem_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ac97_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index f835e68..205fb0d 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -282,17 +282,13 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c
index 5c4c96d..7fb489d 100644
--- a/src/southbridge/intel/i82801gx/ide.c
+++ b/src/southbridge/intel/i82801gx/ide.c
@@ -78,17 +78,13 @@
    printk(BIOS_DEBUG, "\n");
 }

-static struct pci_operations ide_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= ide_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ide_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 7e2b5a7..5bbb8e4 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -651,10 +651,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801gx_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -666,7 +662,7 @@
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
    .enable			= i82801gx_enable,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .final			= lpc_final,
 };

diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c
index f75e3fc..7472438 100644
--- a/src/southbridge/intel/i82801gx/pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
@@ -42,17 +42,13 @@
    pci_write_config16(dev, SECSTS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* Desktop */
diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c
index 7a49e52..adf0e49 100644
--- a/src/southbridge/intel/i82801gx/pcie.c
+++ b/src/southbridge/intel/i82801gx/pcie.c
@@ -232,10 +232,6 @@
    	root_port_commit_config(dev);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -243,7 +239,7 @@
    .init			= pci_init,
    .enable			= ich_pcie_enable,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short i82801gx_pcie_ids[] = {
diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c
index bca0251..c98a645 100644
--- a/src/southbridge/intel/i82801gx/sata.c
+++ b/src/southbridge/intel/i82801gx/sata.c
@@ -211,17 +211,13 @@
    pci_write_config32(dev, SATA_IR, reg32);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short sata_ids[] = {
diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index 88b6e13..e1e53c2 100644
--- a/src/southbridge/intel/i82801gx/smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -65,10 +65,6 @@
    .block_write	= lsmbus_block_write,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -86,7 +82,7 @@
    .scan_bus		= scan_smbus,
    .enable			= i82801gx_enable,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c
index 6689fb8..8ce57df 100644
--- a/src/southbridge/intel/i82801gx/usb.c
+++ b/src/southbridge/intel/i82801gx/usb.c
@@ -27,17 +27,13 @@
    printk(BIOS_DEBUG, "done.\n");
 }

-static struct pci_operations usb_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &usb_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c
index f665ab7..0d9a7be 100644
--- a/src/southbridge/intel/i82801gx/usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/usb_ehci.c
@@ -57,17 +57,13 @@
    pci_write_config8(dev, 0x80, access_cntl);
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem	= &usb_ehci_set_subsystem,
-};
-
 static struct device_operations usb_ehci_ops = {
    .read_resources		= pci_ehci_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_ehci_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &lops_pci,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c
index b78cdd5..5eb907e 100644
--- a/src/southbridge/intel/i82801ix/hdaudio.c
+++ b/src/southbridge/intel/i82801ix/hdaudio.c
@@ -272,16 +272,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M */
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 37f9852..855d7cc 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -502,10 +502,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801ix_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -516,7 +512,7 @@
    .acpi_name		= lpc_acpi_name,
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c
index e558f2f..fff58fe 100644
--- a/src/southbridge/intel/i82801ix/pci.c
+++ b/src/southbridge/intel/i82801ix/pci.c
@@ -30,10 +30,6 @@
    pci_write_config16(dev, PCI_SEC_STATUS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -41,7 +37,7 @@
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
    .reset_bus		= pci_bus_reset,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c
index a10f35f..c5c332c 100644
--- a/src/southbridge/intel/i82801ix/pcie.c
+++ b/src/southbridge/intel/i82801ix/pcie.c
@@ -91,17 +91,13 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pch_pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801Ix (ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M) */
diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c
index 834ed86..390c677 100644
--- a/src/southbridge/intel/i82801ix/sata.c
+++ b/src/southbridge/intel/i82801ix/sata.c
@@ -247,17 +247,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 6ae62c1..6d69226 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -50,10 +50,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -74,7 +70,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver pch_smbus __pci_driver = {
diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c
index 83a1583..810da90 100644
--- a/src/southbridge/intel/i82801ix/thermal.c
+++ b/src/southbridge/intel/i82801ix/thermal.c
@@ -36,16 +36,12 @@
    pci_write_config32(dev, 0x10, 0);
 }

-static struct pci_operations thermal_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= thermal_init,
-	.ops_pci		= &thermal_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver ich9_thermal __pci_driver = {
diff --git a/src/southbridge/intel/i82801jx/hdaudio.c b/src/southbridge/intel/i82801jx/hdaudio.c
index 2a0182f..dc4c82e 100644
--- a/src/southbridge/intel/i82801jx/hdaudio.c
+++ b/src/southbridge/intel/i82801jx/hdaudio.c
@@ -272,16 +272,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index ae98fdd..2b526d8 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -660,10 +660,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801jx_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -674,7 +670,7 @@
    .acpi_name		= lpc_acpi_name,
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/pci.c b/src/southbridge/intel/i82801jx/pci.c
index 6789437..020ecde 100644
--- a/src/southbridge/intel/i82801jx/pci.c
+++ b/src/southbridge/intel/i82801jx/pci.c
@@ -30,10 +30,6 @@
    pci_write_config16(dev, PCI_SEC_STATUS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -41,7 +37,7 @@
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
    .reset_bus		= pci_bus_reset,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/pcie.c b/src/southbridge/intel/i82801jx/pcie.c
index f29e576..3817d88 100644
--- a/src/southbridge/intel/i82801jx/pcie.c
+++ b/src/southbridge/intel/i82801jx/pcie.c
@@ -91,17 +91,13 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pch_pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801lJx, ICH10  */
diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c
index a1e762f..b79b2be 100644
--- a/src/southbridge/intel/i82801jx/sata.c
+++ b/src/southbridge/intel/i82801jx/sata.c
@@ -241,17 +241,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index 7ebd99f..4f45d8a 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -77,10 +77,6 @@
    .block_write    = lsmbus_block_write,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -101,7 +97,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] =
diff --git a/src/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c
index 9dd7067..70a9838 100644
--- a/src/southbridge/intel/i82801jx/thermal.c
+++ b/src/southbridge/intel/i82801jx/thermal.c
@@ -36,16 +36,12 @@
    pci_write_config32(dev, 0x10, 0);
 }

-static struct pci_operations thermal_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= thermal_init,
-	.ops_pci		= &thermal_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 2fdb073..59a384a 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -297,16 +297,12 @@
    pci_write_config8(dev, 0x43, reg8);
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 54b2621..8a555be 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -737,10 +737,6 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -753,7 +749,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c
index 3d8a84e..2c9c87c 100644
--- a/src/southbridge/intel/ibexpeak/me.c
+++ b/src/southbridge/intel/ibexpeak/me.c
@@ -590,16 +590,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index 4343830..357ad5f 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -217,10 +217,6 @@
    generate_sata_ssdt_ports("\_SB_.PCI0.SATA", config->sata_port_map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -228,7 +224,7 @@
    .init = sata_init,
    .enable = sata_enable,
    .acpi_fill_ssdt = sata_fill_ssdt,
-	.ops_pci = &sata_pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index a4cdbd2..7e9aa57 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -56,10 +56,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -80,7 +76,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c
index a1e6b0b..0b496da 100644
--- a/src/southbridge/intel/ibexpeak/thermal.c
+++ b/src/southbridge/intel/ibexpeak/thermal.c
@@ -30,16 +30,12 @@
    printk(BIOS_DEBUG, "Thermal init done.\n");
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations thermal_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = thermal_init,
-	.ops_pci = &pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver pch_thermal __pci_driver = {
diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c
index 7ad9929..6237598 100644
--- a/src/southbridge/intel/ibexpeak/usb_ehci.c
+++ b/src/southbridge/intel/ibexpeak/usb_ehci.c
@@ -66,17 +66,12 @@
    pci_write_config8(dev, 0x80, access_cntl);
 }

-
-static struct pci_operations lops_pci = {
-	.set_subsystem = &usb_ehci_set_subsystem,
-};
-
 static struct device_operations usb_ehci_ops = {
    .read_resources = pci_ehci_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init = usb_ehci_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index 4122dbb..f415170 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -137,16 +137,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x8c20, 0x9c20, 0 };
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 7e1355a..6664c4f 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -926,10 +926,6 @@
    	outb(APM_CNT_FINALIZE, APM_CNT);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -942,7 +938,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index 8914edf..5c07262 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.c
@@ -848,10 +848,6 @@
     */
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void intel_me_enable(struct device *dev)
 {
    /* Avoid talking to the device in S3 path */
@@ -867,7 +863,7 @@
    .enable_resources	= pci_dev_enable_resources,
    .enable			= intel_me_enable,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index e11a0b7..d957e8d 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -708,10 +708,6 @@
    	root_port_commit_config();
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -719,7 +715,7 @@
    .init			= pci_init,
    .enable			= pch_pcie_enable,
    .scan_bus		= pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c
index ab96d62..47e6f9b 100644
--- a/src/southbridge/intel/lynxpoint/sata.c
+++ b/src/southbridge/intel/lynxpoint/sata.c
@@ -310,17 +310,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c
index e093508..e7f2596 100644
--- a/src/southbridge/intel/lynxpoint/serialio.c
+++ b/src/southbridge/intel/lynxpoint/serialio.c
@@ -220,16 +220,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem		= pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= serialio_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c
index e78d85d..39003f6 100644
--- a/src/southbridge/intel/lynxpoint/smbus.c
+++ b/src/southbridge/intel/lynxpoint/smbus.c
@@ -55,10 +55,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -79,7 +75,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index 49a6cfc..8684aa9 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -360,16 +360,12 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = &pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_xhci_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_xhci_init,
-	.ops_pci		= &lops_pci,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x8c31, /* LynxPoint-H */

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Damien Zammit, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41944

to look at the new patch set (#2).

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

src: Use pci_dev_ops_pci where applicable

Change-Id: Ie004a94a49fc8f53c370412bee1c3e7eacbf8beb
Signed-off-by: Angel Pons 
---
M src/device/azalia_device.c
M src/drivers/generic/bayhub/bh720.c
M src/drivers/intel/wifi/wifi.c
M src/northbridge/amd/agesa/family15tn/iommu.c
M src/northbridge/amd/pi/00630F01/iommu.c
M src/northbridge/amd/pi/00730F01/iommu.c
M src/northbridge/intel/e7505/northbridge.c
M src/northbridge/intel/gm45/gma.c
M src/northbridge/intel/haswell/gma.c
M src/northbridge/intel/haswell/minihd.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/haswell/pcie.c
M src/northbridge/intel/i945/gma.c
M src/northbridge/intel/i945/northbridge.c
M src/northbridge/intel/ironlake/gma.c
M src/northbridge/intel/ironlake/northbridge.c
M src/northbridge/intel/pineview/gma.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/northbridge.c
M src/northbridge/intel/sandybridge/pcie.c
M src/northbridge/intel/x4x/gma.c
M src/soc/amd/common/block/iommu/iommu.c
M src/soc/amd/common/block/smbus/sm.c
M src/soc/amd/picasso/acp.c
M src/soc/amd/picasso/usb.c
M src/soc/amd/stoneyridge/usb.c
M src/soc/intel/baytrail/pcie.c
M src/soc/intel/braswell/pcie.c
M src/southbridge/amd/agesa/hudson/hda.c
M src/southbridge/amd/agesa/hudson/ide.c
M src/southbridge/amd/agesa/hudson/lpc.c
M src/southbridge/amd/agesa/hudson/sm.c
M src/southbridge/amd/agesa/hudson/usb.c
M src/southbridge/amd/cimx/sb800/late.c
M src/southbridge/amd/pi/hudson/hda.c
M src/southbridge/amd/pi/hudson/ide.c
M src/southbridge/amd/pi/hudson/lpc.c
M src/southbridge/amd/pi/hudson/sm.c
M src/southbridge/amd/pi/hudson/usb.c
M src/southbridge/intel/bd82x6x/azalia.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/bd82x6x/me.c
M src/southbridge/intel/bd82x6x/me_8.x.c
M src/southbridge/intel/bd82x6x/pci.c
M src/southbridge/intel/bd82x6x/pcie.c
M src/southbridge/intel/bd82x6x/sata.c
M src/southbridge/intel/bd82x6x/smbus.c
M src/southbridge/intel/bd82x6x/usb_xhci.c
M src/southbridge/intel/i82801gx/ac97.c
M src/southbridge/intel/i82801gx/azalia.c
M src/southbridge/intel/i82801gx/ide.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801gx/pci.c
M src/southbridge/intel/i82801gx/pcie.c
M src/southbridge/intel/i82801gx/sata.c
M src/southbridge/intel/i82801gx/smbus.c
M src/southbridge/intel/i82801gx/usb.c
M src/southbridge/intel/i82801gx/usb_ehci.c
M src/southbridge/intel/i82801ix/hdaudio.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801ix/pci.c
M src/southbridge/intel/i82801ix/pcie.c
M src/southbridge/intel/i82801ix/sata.c
M src/southbridge/intel/i82801ix/smbus.c
M src/southbridge/intel/i82801ix/thermal.c
M src/southbridge/intel/i82801jx/hdaudio.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/i82801jx/pci.c
M src/southbridge/intel/i82801jx/pcie.c
M src/southbridge/intel/i82801jx/sata.c
M src/southbridge/intel/i82801jx/smbus.c
M src/southbridge/intel/i82801jx/thermal.c
M src/southbridge/intel/ibexpeak/azalia.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/ibexpeak/me.c
M src/southbridge/intel/ibexpeak/sata.c
M src/southbridge/intel/ibexpeak/smbus.c
M src/southbridge/intel/ibexpeak/thermal.c
M src/southbridge/intel/ibexpeak/usb_ehci.c
M src/southbridge/intel/lynxpoint/azalia.c
M src/southbridge/intel/lynxpoint/lpc.c
M src/southbridge/intel/lynxpoint/me_9.x.c
M src/southbridge/intel/lynxpoint/pcie.c
M src/southbridge/intel/lynxpoint/sata.c
M src/southbridge/intel/lynxpoint/serialio.c
M src/southbridge/intel/lynxpoint/smbus.c
M src/southbridge/intel/lynxpoint/usb_xhci.c
87 files changed, 93 insertions(+), 439 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/41944/2

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Damien Zammit, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41944

to look at the new patch set (#3).

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

src: Use pci_dev_ops_pci where applicable

Change-Id: Ie004a94a49fc8f53c370412bee1c3e7eacbf8beb
Signed-off-by: Angel Pons 
---
M src/device/azalia_device.c
M src/drivers/generic/bayhub/bh720.c
M src/drivers/intel/wifi/wifi.c
M src/northbridge/amd/agesa/family15tn/iommu.c
M src/northbridge/amd/pi/00630F01/iommu.c
M src/northbridge/amd/pi/00730F01/iommu.c
M src/northbridge/intel/e7505/northbridge.c
M src/northbridge/intel/gm45/gma.c
M src/northbridge/intel/haswell/gma.c
M src/northbridge/intel/haswell/minihd.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/haswell/pcie.c
M src/northbridge/intel/i945/gma.c
M src/northbridge/intel/i945/northbridge.c
M src/northbridge/intel/ironlake/gma.c
M src/northbridge/intel/ironlake/northbridge.c
M src/northbridge/intel/pineview/gma.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/northbridge.c
M src/northbridge/intel/sandybridge/pcie.c
M src/northbridge/intel/x4x/gma.c
M src/soc/amd/common/block/iommu/iommu.c
M src/soc/amd/common/block/smbus/sm.c
M src/soc/amd/picasso/acp.c
M src/soc/amd/picasso/usb.c
M src/soc/amd/stoneyridge/usb.c
M src/soc/intel/baytrail/pcie.c
M src/soc/intel/braswell/pcie.c
M src/southbridge/amd/agesa/hudson/hda.c
M src/southbridge/amd/agesa/hudson/ide.c
M src/southbridge/amd/agesa/hudson/lpc.c
M src/southbridge/amd/agesa/hudson/sm.c
M src/southbridge/amd/agesa/hudson/usb.c
M src/southbridge/amd/cimx/sb800/late.c
M src/southbridge/amd/pi/hudson/hda.c
M src/southbridge/amd/pi/hudson/ide.c
M src/southbridge/amd/pi/hudson/lpc.c
M src/southbridge/amd/pi/hudson/sm.c
M src/southbridge/amd/pi/hudson/usb.c
M src/southbridge/intel/bd82x6x/azalia.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/bd82x6x/me.c
M src/southbridge/intel/bd82x6x/me_8.x.c
M src/southbridge/intel/bd82x6x/pci.c
M src/southbridge/intel/bd82x6x/pcie.c
M src/southbridge/intel/bd82x6x/sata.c
M src/southbridge/intel/bd82x6x/smbus.c
M src/southbridge/intel/bd82x6x/usb_xhci.c
M src/southbridge/intel/i82801gx/ac97.c
M src/southbridge/intel/i82801gx/azalia.c
M src/southbridge/intel/i82801gx/ide.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801gx/pci.c
M src/southbridge/intel/i82801gx/pcie.c
M src/southbridge/intel/i82801gx/sata.c
M src/southbridge/intel/i82801gx/smbus.c
M src/southbridge/intel/i82801gx/usb.c
M src/southbridge/intel/i82801ix/hdaudio.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801ix/pci.c
M src/southbridge/intel/i82801ix/pcie.c
M src/southbridge/intel/i82801ix/sata.c
M src/southbridge/intel/i82801ix/smbus.c
M src/southbridge/intel/i82801ix/thermal.c
M src/southbridge/intel/i82801jx/hdaudio.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/i82801jx/pci.c
M src/southbridge/intel/i82801jx/pcie.c
M src/southbridge/intel/i82801jx/sata.c
M src/southbridge/intel/i82801jx/smbus.c
M src/southbridge/intel/i82801jx/thermal.c
M src/southbridge/intel/ibexpeak/azalia.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/ibexpeak/me.c
M src/southbridge/intel/ibexpeak/sata.c
M src/southbridge/intel/ibexpeak/smbus.c
M src/southbridge/intel/ibexpeak/thermal.c
M src/southbridge/intel/lynxpoint/azalia.c
M src/southbridge/intel/lynxpoint/lpc.c
M src/southbridge/intel/lynxpoint/me_9.x.c
M src/southbridge/intel/lynxpoint/pcie.c
M src/southbridge/intel/lynxpoint/sata.c
M src/southbridge/intel/lynxpoint/serialio.c
M src/southbridge/intel/lynxpoint/smbus.c
M src/southbridge/intel/lynxpoint/usb_xhci.c
85 files changed, 91 insertions(+), 428 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/41944/3

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

Patch Set 3: Code-Review+1

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

Patch Set 3: Code-Review+1

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

Patch Set 3: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

src: Use pci_dev_ops_pci where applicable

Change-Id: Ie004a94a49fc8f53c370412bee1c3e7eacbf8beb
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41944
Tested-by: build bot (Jenkins) 
Reviewed-by: Michael Niewöhner
Reviewed-by: Paul Menzel 
Reviewed-by: Nico Huber 
---
M src/device/azalia_device.c
M src/drivers/generic/bayhub/bh720.c
M src/drivers/intel/wifi/wifi.c
M src/northbridge/amd/agesa/family15tn/iommu.c
M src/northbridge/amd/pi/00630F01/iommu.c
M src/northbridge/amd/pi/00730F01/iommu.c
M src/northbridge/intel/e7505/northbridge.c
M src/northbridge/intel/gm45/gma.c
M src/northbridge/intel/haswell/gma.c
M src/northbridge/intel/haswell/minihd.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/haswell/pcie.c
M src/northbridge/intel/i945/gma.c
M src/northbridge/intel/i945/northbridge.c
M src/northbridge/intel/ironlake/gma.c
M src/northbridge/intel/ironlake/northbridge.c
M src/northbridge/intel/pineview/gma.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/northbridge.c
M src/northbridge/intel/sandybridge/pcie.c
M src/northbridge/intel/x4x/gma.c
M src/soc/amd/common/block/iommu/iommu.c
M src/soc/amd/common/block/smbus/sm.c
M src/soc/amd/picasso/acp.c
M src/soc/amd/picasso/usb.c
M src/soc/amd/stoneyridge/usb.c
M src/soc/intel/baytrail/pcie.c
M src/soc/intel/braswell/pcie.c
M src/southbridge/amd/agesa/hudson/hda.c
M src/southbridge/amd/agesa/hudson/ide.c
M src/southbridge/amd/agesa/hudson/lpc.c
M src/southbridge/amd/agesa/hudson/sm.c
M src/southbridge/amd/agesa/hudson/usb.c
M src/southbridge/amd/cimx/sb800/late.c
M src/southbridge/amd/pi/hudson/hda.c
M src/southbridge/amd/pi/hudson/ide.c
M src/southbridge/amd/pi/hudson/lpc.c
M src/southbridge/amd/pi/hudson/sm.c
M src/southbridge/amd/pi/hudson/usb.c
M src/southbridge/intel/bd82x6x/azalia.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/bd82x6x/me.c
M src/southbridge/intel/bd82x6x/me_8.x.c
M src/southbridge/intel/bd82x6x/pci.c
M src/southbridge/intel/bd82x6x/pcie.c
M src/southbridge/intel/bd82x6x/sata.c
M src/southbridge/intel/bd82x6x/smbus.c
M src/southbridge/intel/bd82x6x/usb_xhci.c
M src/southbridge/intel/i82801gx/ac97.c
M src/southbridge/intel/i82801gx/azalia.c
M src/southbridge/intel/i82801gx/ide.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801gx/pci.c
M src/southbridge/intel/i82801gx/pcie.c
M src/southbridge/intel/i82801gx/sata.c
M src/southbridge/intel/i82801gx/smbus.c
M src/southbridge/intel/i82801gx/usb.c
M src/southbridge/intel/i82801ix/hdaudio.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801ix/pci.c
M src/southbridge/intel/i82801ix/pcie.c
M src/southbridge/intel/i82801ix/sata.c
M src/southbridge/intel/i82801ix/smbus.c
M src/southbridge/intel/i82801ix/thermal.c
M src/southbridge/intel/i82801jx/hdaudio.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/i82801jx/pci.c
M src/southbridge/intel/i82801jx/pcie.c
M src/southbridge/intel/i82801jx/sata.c
M src/southbridge/intel/i82801jx/smbus.c
M src/southbridge/intel/i82801jx/thermal.c
M src/southbridge/intel/ibexpeak/azalia.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/ibexpeak/me.c
M src/southbridge/intel/ibexpeak/sata.c
M src/southbridge/intel/ibexpeak/smbus.c
M src/southbridge/intel/ibexpeak/thermal.c
M src/southbridge/intel/lynxpoint/azalia.c
M src/southbridge/intel/lynxpoint/lpc.c
M src/southbridge/intel/lynxpoint/me_9.x.c
M src/southbridge/intel/lynxpoint/pcie.c
M src/southbridge/intel/lynxpoint/sata.c
M src/southbridge/intel/lynxpoint/serialio.c
M src/southbridge/intel/lynxpoint/smbus.c
M src/southbridge/intel/lynxpoint/usb_xhci.c
85 files changed, 91 insertions(+), 428 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve
  Michael Niewöhner: Looks good to me, but someone else must approve

diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index dca4e0a..1e0cf2f 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -241,14 +241,10 @@
    }
 }

-struct pci_operations azalia_audio_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 struct device_operations default_azalia_audio_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= azalia_audio_init,
-	.ops_pci		= &azalia_audio_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };
diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c
index 98193b0..cdac9fe 100644
--- a/src/drivers/generic/bayhub/bh720.c
+++ b/src/drivers/generic/bayhub/bh720.c
@@ -46,15 +46,11 @@
    board_bh720(dev);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations bh720_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .init			= bh720_init,
 };

diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index 2dd3543..9fcd7ba 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -73,10 +73,6 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 struct device_operations device_ops = {
    .read_resources   = pci_dev_read_resources,
    .set_resources    = pci_dev_set_resources,
@@ -85,7 +81,7 @@
 #if CONFIG(GENERATE_SMBIOS_TABLES)
    .get_smbios_data  = smbios_write_wifi,
 #endif
-	.ops_pci          = &pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name        = generic_wifi_acpi_name,
    .acpi_fill_ssdt   = intel_wifi_fill_ssdt,
diff --git a/src/northbridge/amd/agesa/family15tn/iommu.c b/src/northbridge/amd/agesa/family15tn/iommu.c
index a7adfee..7af6538 100644
--- a/src/northbridge/amd/agesa/family15tn/iommu.c
+++ b/src/northbridge/amd/agesa/family15tn/iommu.c
@@ -36,15 +36,11 @@
    pci_write_config32(dev, 0x44, res->base | (1 << 0));
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/amd/pi/00630F01/iommu.c b/src/northbridge/amd/pi/00630F01/iommu.c
index 08486cc..0902243 100644
--- a/src/northbridge/amd/pi/00630F01/iommu.c
+++ b/src/northbridge/amd/pi/00630F01/iommu.c
@@ -36,15 +36,11 @@
    pci_write_config32(dev, 0x44, res->base | (1 << 0));
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/amd/pi/00730F01/iommu.c b/src/northbridge/amd/pi/00730F01/iommu.c
index fa0932a..ef478dd 100644
--- a/src/northbridge/amd/pi/00730F01/iommu.c
+++ b/src/northbridge/amd/pi/00730F01/iommu.c
@@ -26,15 +26,11 @@
    pci_dev_set_resources(dev);
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = iommu_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver iommu_driver __pci_driver = {
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index ee6ec5a..fc771b3 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -61,15 +61,11 @@
    assign_resources(dev->link_list);
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations pci_domain_ops = {
    .read_resources   = mch_domain_read_resources,
    .set_resources    = mch_domain_set_resources,
    .scan_bus         = pci_domain_scan_bus,
-	.ops_pci          = &intel_pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 };

static void cpu_bus_init(struct device *dev)
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 6a51dae..3d48ca2 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -200,17 +200,13 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= gma_acpi_name,
 };

diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 19341d4..68072ff 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -502,17 +502,13 @@
    drivers_intel_gma_displays_ssdt_generate(&chip->gfx);
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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,
    .init			= gma_func0_init,
    .acpi_fill_ssdt		= gma_generate_ssdt,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index f8a16e2..71ca1e6 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -85,16 +85,12 @@
    }
 }

-static struct pci_operations minihd_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations minihd_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= minihd_init,
-	.ops_pci		= &minihd_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x0a0c, 0x0c0c, 0 };
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index c282aea..ef7742e 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -447,17 +447,13 @@
    MCHBAR32(MMIO_PAVP_MSG) = 0x00100001;
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources         = mc_read_resources,
    .set_resources          = pci_dev_set_resources,
    .enable_resources       = pci_dev_enable_resources,
    .init                   = northbridge_init,
    .acpi_fill_ssdt		= generate_cpu_entries,
-	.ops_pci                = &intel_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
 };

static const unsigned short mc_pci_device_ids[] = {
diff --git a/src/northbridge/intel/haswell/pcie.c b/src/northbridge/intel/haswell/pcie.c
index 74f11dd..a47a2f5 100644
--- a/src/northbridge/intel/haswell/pcie.c
+++ b/src/northbridge/intel/haswell/pcie.c
@@ -47,10 +47,6 @@
 }
 #endif

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -59,7 +55,7 @@
    .reset_bus		= pci_bus_reset,
    .disable		= pcie_disable,
    .init			= pci_dev_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name		= pcie_acpi_name,
 #endif
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 183c8f5..34d129d 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -746,10 +746,6 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources		= gma_func0_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -757,7 +753,7 @@
    .init			= gma_func0_init,
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .disable		= gma_func0_disable,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= gma_acpi_name,
 };

@@ -767,7 +763,7 @@
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= gma_func1_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short i945_gma_func0_ids[] = {
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 56cad7a..0e8ea7e 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -174,16 +174,12 @@
    }
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources   = mc_read_resources,
    .set_resources    = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .acpi_fill_ssdt   = generate_cpu_entries,
-	.ops_pci          = &intel_pci_ops,
+	.ops_pci          = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c
index 5ccf8a6..8baccb2 100644
--- a/src/northbridge/intel/ironlake/gma.c
+++ b/src/northbridge/intel/ironlake/gma.c
@@ -191,17 +191,13 @@
    drivers_intel_gma_displays_ssdt_generate(&chip->gfx);
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources		= gma_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index d98af9e..f53b03e 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -227,17 +227,13 @@

}

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources = mc_read_resources,
    .set_resources = mc_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = northbridge_init,
    .acpi_fill_ssdt = generate_cpu_entries,
-	.ops_pci = &intel_pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver mc_driver_ard __pci_driver = {
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index 2f4b629..e46bd7c 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -263,16 +263,12 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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,
    .init                   = gma_func0_init,
-	.ops_pci                = &gma_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_name              = gma_acpi_name,
 };

diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 150b61c..aa66f4a 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -646,10 +646,6 @@
    dev->enabled = 0;
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations gma_func0_ops = {
    .read_resources         = pci_dev_read_resources,
    .set_resources          = pci_dev_set_resources,
@@ -657,7 +653,7 @@
    .acpi_fill_ssdt		= gma_generate_ssdt,
    .init                   = gma_func0_init,
    .disable                = gma_func0_disable,
-	.ops_pci                = &gma_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_name              = gma_acpi_name,
 };

diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ce28c05..1d20a4b 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -425,16 +425,12 @@
    pci_write_config8(pcidev_on_root(0, 0), SMRAM, smram);
 }

-static struct pci_operations intel_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations mc_ops = {
    .read_resources         = mc_read_resources,
    .set_resources          = pci_dev_set_resources,
    .enable_resources       = pci_dev_enable_resources,
    .init                   = northbridge_init,
-	.ops_pci                = &intel_pci_ops,
+	.ops_pci                = &pci_dev_ops_pci,
    .acpi_fill_ssdt		= generate_cpu_entries,
 };

diff --git a/src/northbridge/intel/sandybridge/pcie.c b/src/northbridge/intel/sandybridge/pcie.c
index f2b75d6..d0b7fd5 100644
--- a/src/northbridge/intel/sandybridge/pcie.c
+++ b/src/northbridge/intel/sandybridge/pcie.c
@@ -50,10 +50,6 @@
 }
 #endif

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -62,7 +58,7 @@
    .reset_bus		= pci_bus_reset,
    .disable		= pcie_disable,
    .init			= pci_dev_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name		= pcie_acpi_name,
 #endif
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index ecbd63e..d2d2bb0 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -67,17 +67,13 @@
    return "GFX0";
 }

-static struct pci_operations gma_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 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		= gma_generate_ssdt,
    .init			= gma_func0_init,
-	.ops_pci		= &gma_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .disable		= gma_func0_disable,
    .acpi_name		= gma_acpi_name,
 };
diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c
index bf0b600..c870972 100644
--- a/src/soc/amd/common/block/iommu/iommu.c
+++ b/src/soc/amd/common/block/iommu/iommu.c
@@ -21,15 +21,11 @@
    res->flags = IORESOURCE_MEM;
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations iommu_ops = {
    .read_resources = iommu_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index 5a4edd8..c5c1ed8 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -70,16 +70,13 @@
    .write_byte = lsmbus_write_byte,
 };

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = noop_read_resources,
    .set_resources = noop_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/picasso/acp.c
index e0b369d..cbe5d86 100644
--- a/src/soc/amd/picasso/acp.c
+++ b/src/soc/amd/picasso/acp.c
@@ -41,15 +41,11 @@
    	sb_clk_output_48Mhz(); /* Internal connection to I2S */
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations acp_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = enable,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver acp_driver __pci_driver = {
diff --git a/src/soc/amd/picasso/usb.c b/src/soc/amd/picasso/usb.c
index a507956..7b8c18c 100644
--- a/src/soc/amd/picasso/usb.c
+++ b/src/soc/amd/picasso/usb.c
@@ -18,10 +18,6 @@
    printk(BIOS_DEBUG, "%s\n", __func__);
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -29,7 +25,7 @@
    .init = picasso_usb_init,
    .scan_bus = scan_static_bus,
    .acpi_name = soc_acpi_name,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c
index 921823a..c83f1e1 100644
--- a/src/soc/amd/stoneyridge/usb.c
+++ b/src/soc/amd/stoneyridge/usb.c
@@ -41,10 +41,6 @@
    return -1;
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources = pci_ehci_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -52,7 +48,7 @@
    .init = set_usb_over_current,
    .scan_bus = scan_static_bus,
    .acpi_name = soc_acpi_name,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/baytrail/pcie.c b/src/soc/intel/baytrail/pcie.c
index bac8d58..c257ce0 100644
--- a/src/soc/intel/baytrail/pcie.c
+++ b/src/soc/intel/baytrail/pcie.c
@@ -227,10 +227,6 @@
    do_pci_scan_bridge(dev, pciexp_scan_bus);
 }

-static struct pci_operations pcie_root_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -238,7 +234,7 @@
    .init			= byt_pcie_init,
    .scan_bus		= byt_pciexp_scan_bridge,
    .enable			= byt_pcie_enable,
-	.ops_pci		= &pcie_root_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/braswell/pcie.c b/src/soc/intel/braswell/pcie.c
index d8e423b..c0cf5e4 100644
--- a/src/soc/intel/braswell/pcie.c
+++ b/src/soc/intel/braswell/pcie.c
@@ -142,10 +142,6 @@
    southcluster_enable_dev(dev);
 }

-static struct pci_operations pcie_root_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -153,7 +149,7 @@
    .init			= pcie_init,
    .scan_bus		= pciexp_scan_bridge,
    .enable			= pcie_enable,
-	.ops_pci		= &pcie_root_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 094da2a..a15b045 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -10,16 +10,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations hda_audio_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = hda_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -9,16 +9,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = ide_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 8a1f250..89c9a6b 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -333,10 +333,6 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations lpc_ops = {
    .read_resources = hudson_lpc_read_resources,
    .set_resources = hudson_lpc_set_resources,
@@ -347,7 +343,7 @@
    .init = lpc_init,
    .final = lpc_final,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };
 static const struct pci_driver lpc_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 39e6752..a6b1464 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -129,16 +129,13 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = hudson_sm_read_resources,
    .set_resources = hudson_sm_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index ff691cf..1175f08 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -6,10 +6,6 @@
 #include <device/pci_ehci.h>
 #include "hudson.h"

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void usb_init(struct device *dev)
 {
 }
@@ -19,7 +15,7 @@
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = usb_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver usb_0_driver __pci_driver = {
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index de91a9a..d57ce00 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -102,10 +102,6 @@
    printk(BIOS_DEBUG, "AHCI/RAID controller initialized\n");
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void lpc_init(struct device *dev)
 {
    printk(BIOS_DEBUG, "SB800 - Late.c - %s - Start.\n", __func__);
@@ -154,7 +150,7 @@
 #endif
    .init = lpc_init,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };

@@ -169,7 +165,7 @@
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = ahci_raid_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver ahci_driver __pci_driver = {
@@ -193,7 +189,7 @@
    .read_resources = pci_ehci_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

/*
@@ -222,7 +218,7 @@
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver azalia_driver __pci_driver = {
@@ -236,7 +232,7 @@
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver gec_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index 3c98c66..f11eee5 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -16,16 +16,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations hda_audio_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = hda_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.c
@@ -9,16 +9,12 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = ide_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index ebc9de5..c884f20 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -349,10 +349,6 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations lpc_ops = {
    .read_resources = hudson_lpc_read_resources,
    .set_resources = hudson_lpc_set_resources,
@@ -363,7 +359,7 @@
    .init = lpc_init,
    .final = lpc_final,
    .scan_bus = scan_static_bus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .acpi_name = lpc_acpi_name,
 };

diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index 268d7e4..6f9e03c 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -94,16 +94,13 @@
 {
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
 static struct device_operations smbus_ops = {
    .read_resources = hudson_sm_read_resources,
    .set_resources = hudson_sm_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = sm_init,
    .scan_bus = scan_smbus,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
    .ops_smbus_bus = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index 3318349..fecae74 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -6,10 +6,6 @@
 #include <device/pci_ehci.h>
 #include "hudson.h"

-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void usb_init(struct device *dev)
 {
 }
@@ -19,7 +15,7 @@
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = usb_init,
-	.ops_pci = &lops_pci,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 3be7b44..470c67c 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -322,16 +322,12 @@
    return "HDEF";
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= azalia_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 0f1d33e..691db62 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -861,10 +861,6 @@
    	memcpy(spi_config, &config->spi, sizeof(*spi_config));
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -877,7 +873,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index 436553c..bc0a71e 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -676,16 +676,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver intel_me __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index b930d3f..f64e29c 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -667,16 +667,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver intel_me __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index 6b36a4b..e61c60c 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -44,17 +44,13 @@
    pci_write_config16(dev, SECSTS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver pch_pci __pci_driver = {
diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index 86935f8..5bc3412 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -292,10 +292,6 @@
    return NULL;
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -304,7 +300,7 @@
    .enable			= pch_pcie_enable,
    .scan_bus		= pch_pciexp_scan_bridge,
    .acpi_name		= pch_pcie_acpi_name,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16,
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index 27b4d16..1974e2b 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -279,10 +279,6 @@
    generate_sata_ssdt_ports("\_SB_.PCI0.SATA", config->sata_port_map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= sata_read_resources,
    .set_resources		= sata_set_resources,
@@ -290,7 +286,7 @@
    .acpi_fill_ssdt		= sata_fill_ssdt,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= sata_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 6e5be9b..1b72ea5 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -56,10 +56,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -85,7 +81,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= smbus_acpi_name,
 };

diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index db925e0..5a5b418 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -43,16 +43,12 @@
    return "XHC";
 }

-static struct pci_operations xhci_pci_ops = {
-	.set_subsystem		= pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_xhci_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_xhci_init,
-	.ops_pci		= &xhci_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .acpi_name		= xhci_acpi_name,
 };

diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index 67426c7..cc6e376 100644
--- a/src/southbridge/intel/i82801gx/ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
@@ -234,17 +234,13 @@
    }
 }

-static struct pci_operations ac97_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations ac97_audio_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= ac97_audio_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ac97_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static struct device_operations ac97_modem_ops = {
@@ -253,7 +249,7 @@
    .enable_resources	= pci_dev_enable_resources,
    .init			= ac97_modem_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ac97_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index f835e68..205fb0d 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -282,17 +282,13 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c
index 5c4c96d..7fb489d 100644
--- a/src/southbridge/intel/i82801gx/ide.c
+++ b/src/southbridge/intel/i82801gx/ide.c
@@ -78,17 +78,13 @@
    printk(BIOS_DEBUG, "\n");
 }

-static struct pci_operations ide_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations ide_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= ide_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &ide_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index d4aef55..0bfe8eb 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -653,10 +653,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801gx_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -668,7 +664,7 @@
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
    .enable			= i82801gx_enable,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
    .final			= lpc_final,
 };

diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c
index f75e3fc..7472438 100644
--- a/src/southbridge/intel/i82801gx/pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
@@ -42,17 +42,13 @@
    pci_write_config16(dev, SECSTS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* Desktop */
diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c
index 7a49e52..adf0e49 100644
--- a/src/southbridge/intel/i82801gx/pcie.c
+++ b/src/southbridge/intel/i82801gx/pcie.c
@@ -232,10 +232,6 @@
    	root_port_commit_config(dev);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -243,7 +239,7 @@
    .init			= pci_init,
    .enable			= ich_pcie_enable,
    .scan_bus		= pci_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short i82801gx_pcie_ids[] = {
diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c
index bca0251..c98a645 100644
--- a/src/southbridge/intel/i82801gx/sata.c
+++ b/src/southbridge/intel/i82801gx/sata.c
@@ -211,17 +211,13 @@
    pci_write_config32(dev, SATA_IR, reg32);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short sata_ids[] = {
diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index 88b6e13..e1e53c2 100644
--- a/src/southbridge/intel/i82801gx/smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -65,10 +65,6 @@
    .block_write	= lsmbus_block_write,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -86,7 +82,7 @@
    .scan_bus		= scan_smbus,
    .enable			= i82801gx_enable,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c
index 6689fb8..8ce57df 100644
--- a/src/southbridge/intel/i82801gx/usb.c
+++ b/src/southbridge/intel/i82801gx/usb.c
@@ -27,17 +27,13 @@
    printk(BIOS_DEBUG, "done.\n");
 }

-static struct pci_operations usb_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_init,
    .enable			= i82801gx_enable,
-	.ops_pci		= &usb_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c
index b78cdd5..5eb907e 100644
--- a/src/southbridge/intel/i82801ix/hdaudio.c
+++ b/src/southbridge/intel/i82801ix/hdaudio.c
@@ -272,16 +272,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M */
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 37f9852..855d7cc 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -502,10 +502,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801ix_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -516,7 +512,7 @@
    .acpi_name		= lpc_acpi_name,
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c
index e558f2f..fff58fe 100644
--- a/src/southbridge/intel/i82801ix/pci.c
+++ b/src/southbridge/intel/i82801ix/pci.c
@@ -30,10 +30,6 @@
    pci_write_config16(dev, PCI_SEC_STATUS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -41,7 +37,7 @@
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
    .reset_bus		= pci_bus_reset,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c
index a10f35f..c5c332c 100644
--- a/src/southbridge/intel/i82801ix/pcie.c
+++ b/src/southbridge/intel/i82801ix/pcie.c
@@ -91,17 +91,13 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pch_pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801Ix (ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M) */
diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c
index 834ed86..390c677 100644
--- a/src/southbridge/intel/i82801ix/sata.c
+++ b/src/southbridge/intel/i82801ix/sata.c
@@ -247,17 +247,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 6ae62c1..6d69226 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -50,10 +50,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -74,7 +70,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver pch_smbus __pci_driver = {
diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c
index 83a1583..810da90 100644
--- a/src/southbridge/intel/i82801ix/thermal.c
+++ b/src/southbridge/intel/i82801ix/thermal.c
@@ -36,16 +36,12 @@
    pci_write_config32(dev, 0x10, 0);
 }

-static struct pci_operations thermal_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= thermal_init,
-	.ops_pci		= &thermal_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const struct pci_driver ich9_thermal __pci_driver = {
diff --git a/src/southbridge/intel/i82801jx/hdaudio.c b/src/southbridge/intel/i82801jx/hdaudio.c
index 2a0182f..dc4c82e 100644
--- a/src/southbridge/intel/i82801jx/hdaudio.c
+++ b/src/southbridge/intel/i82801jx/hdaudio.c
@@ -272,16 +272,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 7a1b24b..f2c9afa 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -662,10 +662,6 @@
    intel_acpi_gen_def_acpi_pirq(device);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= i82801jx_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -676,7 +672,7 @@
    .acpi_name		= lpc_acpi_name,
    .init			= lpc_init,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/pci.c b/src/southbridge/intel/i82801jx/pci.c
index 6789437..020ecde 100644
--- a/src/southbridge/intel/i82801jx/pci.c
+++ b/src/southbridge/intel/i82801jx/pci.c
@@ -30,10 +30,6 @@
    pci_write_config16(dev, PCI_SEC_STATUS, reg16);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -41,7 +37,7 @@
    .init			= pci_init,
    .scan_bus		= pci_scan_bridge,
    .reset_bus		= pci_bus_reset,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/pcie.c b/src/southbridge/intel/i82801jx/pcie.c
index f29e576..3817d88 100644
--- a/src/southbridge/intel/i82801jx/pcie.c
+++ b/src/southbridge/intel/i82801jx/pcie.c
@@ -91,17 +91,13 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_bus_enable_resources,
    .init			= pci_init,
    .scan_bus		= pch_pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

/* 82801lJx, ICH10  */
diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c
index a1e762f..b79b2be 100644
--- a/src/southbridge/intel/i82801jx/sata.c
+++ b/src/southbridge/intel/i82801jx/sata.c
@@ -241,17 +241,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index 7ebd99f..4f45d8a 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -77,10 +77,6 @@
    .block_write    = lsmbus_block_write,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -101,7 +97,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] =
diff --git a/src/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c
index 9dd7067..70a9838 100644
--- a/src/southbridge/intel/i82801jx/thermal.c
+++ b/src/southbridge/intel/i82801jx/thermal.c
@@ -36,16 +36,12 @@
    pci_write_config32(dev, 0x10, 0);
 }

-static struct pci_operations thermal_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= thermal_init,
-	.ops_pci		= &thermal_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 2fdb073..59a384a 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -297,16 +297,12 @@
    pci_write_config8(dev, 0x43, reg8);
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 742b86d..f8926dc 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -737,10 +737,6 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -753,7 +749,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c
index 3d8a84e..2c9c87c 100644
--- a/src/southbridge/intel/ibexpeak/me.c
+++ b/src/southbridge/intel/ibexpeak/me.c
@@ -590,16 +590,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index 4343830..357ad5f 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -217,10 +217,6 @@
    generate_sata_ssdt_ports("\_SB_.PCI0.SATA", config->sata_port_map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
@@ -228,7 +224,7 @@
    .init = sata_init,
    .enable = sata_enable,
    .acpi_fill_ssdt = sata_fill_ssdt,
-	.ops_pci = &sata_pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index a4cdbd2..7e9aa57 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -56,10 +56,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -80,7 +76,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c
index a1e6b0b..0b496da 100644
--- a/src/southbridge/intel/ibexpeak/thermal.c
+++ b/src/southbridge/intel/ibexpeak/thermal.c
@@ -30,16 +30,12 @@
    printk(BIOS_DEBUG, "Thermal init done.\n");
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations thermal_ops = {
    .read_resources = pci_dev_read_resources,
    .set_resources = pci_dev_set_resources,
    .enable_resources = pci_dev_enable_resources,
    .init = thermal_init,
-	.ops_pci = &pci_ops,
+	.ops_pci = &pci_dev_ops_pci,
 };

static const struct pci_driver pch_thermal __pci_driver = {
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index 4122dbb..f415170 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -137,16 +137,12 @@
    }
 }

-static struct pci_operations azalia_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 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			= azalia_init,
-	.ops_pci		= &azalia_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x8c20, 0x9c20, 0 };
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 1d75555..8a61b29 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -926,10 +926,6 @@
    	outb(APM_CNT_FINALIZE, APM_CNT);
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pch_lpc_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -942,7 +938,7 @@
    .final			= lpc_final,
    .enable			= pch_lpc_enable,
    .scan_bus		= scan_static_bus,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index 6223a3d..aeab0c7 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.c
@@ -848,10 +848,6 @@
     */
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static void intel_me_enable(struct device *dev)
 {
    /* Avoid talking to the device in S3 path */
@@ -867,7 +863,7 @@
    .enable_resources	= pci_dev_enable_resources,
    .enable			= intel_me_enable,
    .init			= intel_me_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index e11a0b7..d957e8d 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -708,10 +708,6 @@
    	root_port_commit_config();
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_bus_read_resources,
    .set_resources		= pci_dev_set_resources,
@@ -719,7 +715,7 @@
    .init			= pci_init,
    .enable			= pch_pcie_enable,
    .scan_bus		= pciexp_scan_bridge,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c
index ab96d62..47e6f9b 100644
--- a/src/southbridge/intel/lynxpoint/sata.c
+++ b/src/southbridge/intel/lynxpoint/sata.c
@@ -310,17 +310,13 @@
    pci_write_config16(dev, 0x90, map);
 }

-static struct pci_operations sata_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= sata_init,
    .enable			= sata_enable,
-	.ops_pci		= &sata_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c
index adb9067..cdb1f35 100644
--- a/src/southbridge/intel/lynxpoint/serialio.c
+++ b/src/southbridge/intel/lynxpoint/serialio.c
@@ -220,16 +220,12 @@
    }
 }

-static struct pci_operations pci_ops = {
-	.set_subsystem		= pci_dev_set_subsystem,
-};
-
 static struct device_operations device_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= serialio_init,
-	.ops_pci		= &pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c
index e78d85d..39003f6 100644
--- a/src/southbridge/intel/lynxpoint/smbus.c
+++ b/src/southbridge/intel/lynxpoint/smbus.c
@@ -55,10 +55,6 @@
    .write_byte	= lsmbus_write_byte,
 };

-static struct pci_operations smbus_pci_ops = {
-	.set_subsystem    = pci_dev_set_subsystem,
-};
-
 static void smbus_read_resources(struct device *dev)
 {
    struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
@@ -79,7 +75,7 @@
    .scan_bus		= scan_smbus,
    .init			= pch_smbus_init,
    .ops_smbus_bus		= &lops_smbus_bus,
-	.ops_pci		= &smbus_pci_ops,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index 49a6cfc..8684aa9 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -360,16 +360,12 @@
    }
 }

-static struct pci_operations lops_pci = {
-	.set_subsystem = &pci_dev_set_subsystem,
-};
-
 static struct device_operations usb_xhci_ops = {
    .read_resources		= pci_dev_read_resources,
    .set_resources		= pci_dev_set_resources,
    .enable_resources	= pci_dev_enable_resources,
    .init			= usb_xhci_init,
-	.ops_pci		= &lops_pci,
+	.ops_pci		= &pci_dev_ops_pci,
 };

static const unsigned short pci_device_ids[] = { 0x8c31, /* LynxPoint-H */

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41944 )

Change subject: src: Use pci_dev_ops_pci where applicable
......................................................................

Patch Set 4:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/5192
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5191
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5190
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/5189

Please note: This test is under development and might not be accurate at all!