diff options
85 files changed, 91 insertions, 428 deletions
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index dca4e0a110..1e0cf2f5cb 100644 --- a/src/device/azalia_device.c +++ b/src/device/azalia_device.c @@ -241,14 +241,10 @@ void azalia_audio_init(struct device *dev) } } -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 98193b0cbf..cdac9fe35a 100644 --- a/src/drivers/generic/bayhub/bh720.c +++ b/src/drivers/generic/bayhub/bh720.c @@ -46,15 +46,11 @@ static void bh720_init(struct device *dev) 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 2dd35437fd..9fcd7ba8af 100644 --- a/src/drivers/intel/wifi/wifi.c +++ b/src/drivers/intel/wifi/wifi.c @@ -73,10 +73,6 @@ static void wifi_pci_dev_init(struct device *dev) } } -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 @@ struct device_operations device_ops = { #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 a7adfee02a..7af65389f3 100644 --- a/src/northbridge/amd/agesa/family15tn/iommu.c +++ b/src/northbridge/amd/agesa/family15tn/iommu.c @@ -36,15 +36,11 @@ static void iommu_set_resources(struct device *dev) 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 08486cc0ee..0902243ab7 100644 --- a/src/northbridge/amd/pi/00630F01/iommu.c +++ b/src/northbridge/amd/pi/00630F01/iommu.c @@ -36,15 +36,11 @@ static void iommu_set_resources(struct device *dev) 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 fa0932a5f1..ef478dda15 100644 --- a/src/northbridge/amd/pi/00730F01/iommu.c +++ b/src/northbridge/amd/pi/00730F01/iommu.c @@ -26,15 +26,11 @@ static void iommu_set_resources(struct device *dev) 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 ee6ec5a0ec..fc771b3c3a 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -61,15 +61,11 @@ static void mch_domain_set_resources(struct device *dev) 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 6a51daee7c..3d48ca2c2b 100644 --- a/src/northbridge/intel/gm45/gma.c +++ b/src/northbridge/intel/gm45/gma.c @@ -200,17 +200,13 @@ static const char *gma_acpi_name(const struct device *dev) 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 19341d4d37..68072ff359 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -502,17 +502,13 @@ static void gma_generate_ssdt(const struct device *dev) 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 f8a16e231f..71ca1e6cf5 100644 --- a/src/northbridge/intel/haswell/minihd.c +++ b/src/northbridge/intel/haswell/minihd.c @@ -85,16 +85,12 @@ static void minihd_init(struct device *dev) } } -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 c282aea044..ef7742e523 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -447,17 +447,13 @@ static void northbridge_init(struct device *dev) 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 74f11dde8c..a47a2f507c 100644 --- a/src/northbridge/intel/haswell/pcie.c +++ b/src/northbridge/intel/haswell/pcie.c @@ -47,10 +47,6 @@ static const char *pcie_acpi_name(const struct device *dev) } #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 @@ static struct device_operations device_ops = { .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 183c8f5b59..34d129d502 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -746,10 +746,6 @@ static const char *gma_acpi_name(const struct device *dev) 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 @@ static struct device_operations gma_func0_ops = { .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 @@ static struct device_operations gma_func1_ops = { .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 56cad7a971..0e8ea7e77e 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -174,16 +174,12 @@ static void mc_read_resources(struct device *dev) } } -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 5ccf8a6a6b..8baccb2831 100644 --- a/src/northbridge/intel/ironlake/gma.c +++ b/src/northbridge/intel/ironlake/gma.c @@ -191,17 +191,13 @@ static void gma_generate_ssdt(const struct device *device) 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 d98af9edc9..f53b03ea8b 100644 --- a/src/northbridge/intel/ironlake/northbridge.c +++ b/src/northbridge/intel/ironlake/northbridge.c @@ -227,17 +227,13 @@ static void ironlake_init(void *const chip_info) } -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 2f4b629ee6..e46bd7c7c2 100644 --- a/src/northbridge/intel/pineview/gma.c +++ b/src/northbridge/intel/pineview/gma.c @@ -263,16 +263,12 @@ static const char *gma_acpi_name(const struct device *dev) 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 150b61c9b9..aa66f4ae84 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -646,10 +646,6 @@ static void gma_func0_disable(struct device *dev) 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 @@ static struct device_operations gma_func0_ops = { .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 ce28c05fd4..1d20a4b57a 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -425,16 +425,12 @@ void northbridge_write_smram(u8 smram) 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 f2b75d6ca6..d0b7fd5820 100644 --- a/src/northbridge/intel/sandybridge/pcie.c +++ b/src/northbridge/intel/sandybridge/pcie.c @@ -50,10 +50,6 @@ static const char *pcie_acpi_name(const struct device *dev) } #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 @@ static struct device_operations device_ops = { .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 ecbd63e616..d2d2bb067d 100644 --- a/src/northbridge/intel/x4x/gma.c +++ b/src/northbridge/intel/x4x/gma.c @@ -67,17 +67,13 @@ static const char *gma_acpi_name(const struct device *dev) 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 bf0b6003b2..c870972813 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -21,15 +21,11 @@ static void iommu_read_resources(struct device *dev) 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 5a4edd8b2b..c5c1ed8990 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -70,16 +70,13 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 e0b369d65e..cbe5d860b0 100644 --- a/src/soc/amd/picasso/acp.c +++ b/src/soc/amd/picasso/acp.c @@ -41,15 +41,11 @@ static void enable(struct device *dev) 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 a507956c85..7b8c18c208 100644 --- a/src/soc/amd/picasso/usb.c +++ b/src/soc/amd/picasso/usb.c @@ -18,10 +18,6 @@ static void picasso_usb_init(struct device *dev) 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 @@ static struct device_operations usb_ops = { .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 921823ae83..c83f1e15d0 100644 --- a/src/soc/amd/stoneyridge/usb.c +++ b/src/soc/amd/stoneyridge/usb.c @@ -41,10 +41,6 @@ int __weak mainboard_get_ehci_oc_map(uint16_t *map) 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 @@ static struct device_operations usb_ops = { .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 bac8d58559..c257ce0f3e 100644 --- a/src/soc/intel/baytrail/pcie.c +++ b/src/soc/intel/baytrail/pcie.c @@ -227,10 +227,6 @@ static void byt_pciexp_scan_bridge(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 d8e423b2ff..c0cf5e4b98 100644 --- a/src/soc/intel/braswell/pcie.c +++ b/src/soc/intel/braswell/pcie.c @@ -142,10 +142,6 @@ static void pcie_enable(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 094da2afb2..a15b045ab8 100644 --- a/src/southbridge/amd/agesa/hudson/hda.c +++ b/src/southbridge/amd/agesa/hudson/hda.c @@ -10,16 +10,12 @@ static void hda_init(struct device *dev) { } -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 3b18bd4254..8ba7a12c1c 100644 --- a/src/southbridge/amd/agesa/hudson/ide.c +++ b/src/southbridge/amd/agesa/hudson/ide.c @@ -9,16 +9,12 @@ static void ide_init(struct device *dev) { } -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 8a1f250466..89c9a6b9a1 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -333,10 +333,6 @@ static void lpc_final(struct device *dev) } } -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 @@ static struct device_operations lpc_ops = { .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 39e6752f6e..a6b146463f 100644 --- a/src/southbridge/amd/agesa/hudson/sm.c +++ b/src/southbridge/amd/agesa/hudson/sm.c @@ -129,16 +129,13 @@ static void hudson_sm_set_resources(struct device *dev) { } -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 ff691cfa4f..1175f081aa 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 @@ static struct device_operations usb_ops = { .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 de91a9af51..d57ce006a3 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -102,10 +102,6 @@ static void ahci_raid_init(struct device *dev) 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 @@ static struct device_operations lpc_ops = { #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 @@ static struct device_operations sata_ops = { .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 @@ static struct device_operations usb_ops = { .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 @@ static struct device_operations azalia_ops = { .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 @@ static struct device_operations gec_ops = { .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 3c98c66b67..f11eee5d98 100644 --- a/src/southbridge/amd/pi/hudson/hda.c +++ b/src/southbridge/amd/pi/hudson/hda.c @@ -16,16 +16,12 @@ static void hda_init(struct device *dev) { } -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 3b18bd4254..8ba7a12c1c 100644 --- a/src/southbridge/amd/pi/hudson/ide.c +++ b/src/southbridge/amd/pi/hudson/ide.c @@ -9,16 +9,12 @@ static void ide_init(struct device *dev) { } -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 ebc9de5c83..c884f209d3 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -349,10 +349,6 @@ static void lpc_final(struct device *dev) } } -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 @@ static struct device_operations lpc_ops = { .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 268d7e4ee2..6f9e03c2d3 100644 --- a/src/southbridge/amd/pi/hudson/sm.c +++ b/src/southbridge/amd/pi/hudson/sm.c @@ -94,16 +94,13 @@ static void hudson_sm_set_resources(struct device *dev) { } -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 3318349557..fecae7467e 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 @@ static struct device_operations usb_ops = { .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 3be7b44676..470c67c9b2 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -322,16 +322,12 @@ static const char *azalia_acpi_name(const struct device *dev) 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 0f1d33e1c8..691db62cbe 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -861,10 +861,6 @@ void intel_southbridge_override_spi( 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 @@ static struct device_operations device_ops = { .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 436553cd0f..bc0a71e3a7 100644 --- a/src/southbridge/intel/bd82x6x/me.c +++ b/src/southbridge/intel/bd82x6x/me.c @@ -676,16 +676,12 @@ static void intel_me_init(struct device *dev) } } -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 b930d3f1b1..f64e29c64a 100644 --- a/src/southbridge/intel/bd82x6x/me_8.x.c +++ b/src/southbridge/intel/bd82x6x/me_8.x.c @@ -667,16 +667,12 @@ static void intel_me_init(struct device *dev) } } -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 6b36a4b0a8..e61c60cf85 100644 --- a/src/southbridge/intel/bd82x6x/pci.c +++ b/src/southbridge/intel/bd82x6x/pci.c @@ -44,17 +44,13 @@ static void pci_init(struct device *dev) 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 86935f8efd..5bc3412efa 100644 --- a/src/southbridge/intel/bd82x6x/pcie.c +++ b/src/southbridge/intel/bd82x6x/pcie.c @@ -292,10 +292,6 @@ static const char *pch_pcie_acpi_name(const struct device *dev) 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 @@ static struct device_operations device_ops = { .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 27b4d16bc5..1974e2b855 100644 --- a/src/southbridge/intel/bd82x6x/sata.c +++ b/src/southbridge/intel/bd82x6x/sata.c @@ -279,10 +279,6 @@ static void sata_fill_ssdt(const struct device *dev) 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 @@ static struct device_operations sata_ops = { .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 6e5be9b484..1b72ea51ef 100644 --- a/src/southbridge/intel/bd82x6x/smbus.c +++ b/src/southbridge/intel/bd82x6x/smbus.c @@ -56,10 +56,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 db925e0df0..5a5b418b43 100644 --- a/src/southbridge/intel/bd82x6x/usb_xhci.c +++ b/src/southbridge/intel/bd82x6x/usb_xhci.c @@ -43,16 +43,12 @@ static const char *xhci_acpi_name(const struct device *dev) 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 67426c7323..cc6e376130 100644 --- a/src/southbridge/intel/i82801gx/ac97.c +++ b/src/southbridge/intel/i82801gx/ac97.c @@ -234,17 +234,13 @@ static void ac97_modem_init(struct device *dev) } } -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 @@ static struct device_operations ac97_modem_ops = { .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 f835e68990..205fb0dbf4 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -282,17 +282,13 @@ static void azalia_init(struct device *dev) } } -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 5c4c96d8c8..7fb489dc2c 100644 --- a/src/southbridge/intel/i82801gx/ide.c +++ b/src/southbridge/intel/i82801gx/ide.c @@ -78,17 +78,13 @@ static void ide_init(struct device *dev) 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 d4aef55f43..0bfe8eb52f 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -653,10 +653,6 @@ static void southbridge_fill_ssdt(const struct device *device) 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 @@ static struct device_operations device_ops = { .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 f75e3fc41e..74724383a2 100644 --- a/src/southbridge/intel/i82801gx/pci.c +++ b/src/southbridge/intel/i82801gx/pci.c @@ -42,17 +42,13 @@ static void pci_init(struct device *dev) 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 7a49e52859..adf0e491b5 100644 --- a/src/southbridge/intel/i82801gx/pcie.c +++ b/src/southbridge/intel/i82801gx/pcie.c @@ -232,10 +232,6 @@ static void ich_pcie_enable(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 bca02515d2..c98a645db7 100644 --- a/src/southbridge/intel/i82801gx/sata.c +++ b/src/southbridge/intel/i82801gx/sata.c @@ -211,17 +211,13 @@ static void sata_init(struct device *dev) 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 88b6e13330..e1e53c22de 100644 --- a/src/southbridge/intel/i82801gx/smbus.c +++ b/src/southbridge/intel/i82801gx/smbus.c @@ -65,10 +65,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 6689fb854c..8ce57dfd13 100644 --- a/src/southbridge/intel/i82801gx/usb.c +++ b/src/southbridge/intel/i82801gx/usb.c @@ -27,17 +27,13 @@ static void usb_init(struct device *dev) 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 b78cdd5270..5eb907ec3b 100644 --- a/src/southbridge/intel/i82801ix/hdaudio.c +++ b/src/southbridge/intel/i82801ix/hdaudio.c @@ -272,16 +272,12 @@ static void azalia_init(struct device *dev) } } -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 37f9852c64..855d7cc7f9 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -502,10 +502,6 @@ static void southbridge_fill_ssdt(const struct device *device) 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 @@ static struct device_operations device_ops = { .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 e558f2f5f2..fff58fe08c 100644 --- a/src/southbridge/intel/i82801ix/pci.c +++ b/src/southbridge/intel/i82801ix/pci.c @@ -30,10 +30,6 @@ static void pci_init(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 a10f35f157..c5c332c85d 100644 --- a/src/southbridge/intel/i82801ix/pcie.c +++ b/src/southbridge/intel/i82801ix/pcie.c @@ -91,17 +91,13 @@ static void pch_pciexp_scan_bridge(struct device *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, .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 834ed86362..390c67765b 100644 --- a/src/southbridge/intel/i82801ix/sata.c +++ b/src/southbridge/intel/i82801ix/sata.c @@ -247,17 +247,13 @@ static void sata_enable(struct device *dev) 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 6ae62c1ac2..6d692263b5 100644 --- a/src/southbridge/intel/i82801ix/smbus.c +++ b/src/southbridge/intel/i82801ix/smbus.c @@ -50,10 +50,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 83a15830ab..810da903d1 100644 --- a/src/southbridge/intel/i82801ix/thermal.c +++ b/src/southbridge/intel/i82801ix/thermal.c @@ -36,16 +36,12 @@ static void thermal_init(struct device *dev) 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 2a0182f1e3..dc4c82e5ab 100644 --- a/src/southbridge/intel/i82801jx/hdaudio.c +++ b/src/southbridge/intel/i82801jx/hdaudio.c @@ -272,16 +272,12 @@ static void azalia_init(struct device *dev) } } -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 7a1b24b92b..f2c9afa7fa 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -662,10 +662,6 @@ static void southbridge_fill_ssdt(const struct device *device) 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 @@ static struct device_operations device_ops = { .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 6789437e00..020ecdeafb 100644 --- a/src/southbridge/intel/i82801jx/pci.c +++ b/src/southbridge/intel/i82801jx/pci.c @@ -30,10 +30,6 @@ static void pci_init(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 f29e576a4a..3817d88aad 100644 --- a/src/southbridge/intel/i82801jx/pcie.c +++ b/src/southbridge/intel/i82801jx/pcie.c @@ -91,17 +91,13 @@ static void pch_pciexp_scan_bridge(struct device *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, .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 a1e762f81c..b79b2be366 100644 --- a/src/southbridge/intel/i82801jx/sata.c +++ b/src/southbridge/intel/i82801jx/sata.c @@ -241,17 +241,13 @@ static void sata_enable(struct device *dev) 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 7ebd99fd84..4f45d8a5cb 100644 --- a/src/southbridge/intel/i82801jx/smbus.c +++ b/src/southbridge/intel/i82801jx/smbus.c @@ -77,10 +77,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 9dd706748b..70a98388a9 100644 --- a/src/southbridge/intel/i82801jx/thermal.c +++ b/src/southbridge/intel/i82801jx/thermal.c @@ -36,16 +36,12 @@ static void thermal_init(struct device *dev) 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 2fdb073cd0..59a384a81e 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -297,16 +297,12 @@ static void azalia_init(struct device *dev) 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 742b86dfdf..f8926dc302 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -737,10 +737,6 @@ static void lpc_final(struct device *dev) } } -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 @@ static struct device_operations device_ops = { .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 3d8a84ea32..2c9c87cbcc 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -590,16 +590,12 @@ static void intel_me_init(struct device *dev) } } -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 4343830a15..357ad5fc99 100644 --- a/src/southbridge/intel/ibexpeak/sata.c +++ b/src/southbridge/intel/ibexpeak/sata.c @@ -217,10 +217,6 @@ static void sata_fill_ssdt(const struct device *dev) 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 @@ static struct device_operations sata_ops = { .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 a4cdbd25d7..7e9aa57da8 100644 --- a/src/southbridge/intel/ibexpeak/smbus.c +++ b/src/southbridge/intel/ibexpeak/smbus.c @@ -56,10 +56,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 a1e6b0b49e..0b496dae55 100644 --- a/src/southbridge/intel/ibexpeak/thermal.c +++ b/src/southbridge/intel/ibexpeak/thermal.c @@ -30,16 +30,12 @@ static void thermal_init(struct device *dev) 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 4122dbb364..f415170fc9 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -137,16 +137,12 @@ static void azalia_init(struct device *dev) } } -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 1d755555d3..8a61b295ae 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -926,10 +926,6 @@ static void lpc_final(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 6223a3d583..aeab0c753a 100644 --- a/src/southbridge/intel/lynxpoint/me_9.x.c +++ b/src/southbridge/intel/lynxpoint/me_9.x.c @@ -848,10 +848,6 @@ static void intel_me_init(struct device *dev) */ } -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 @@ static struct device_operations device_ops = { .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 e11a0b77fe..d957e8d3c8 100644 --- a/src/southbridge/intel/lynxpoint/pcie.c +++ b/src/southbridge/intel/lynxpoint/pcie.c @@ -708,10 +708,6 @@ static void pch_pcie_enable(struct device *dev) 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 @@ static struct device_operations device_ops = { .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 ab96d6292a..47e6f9be68 100644 --- a/src/southbridge/intel/lynxpoint/sata.c +++ b/src/southbridge/intel/lynxpoint/sata.c @@ -310,17 +310,13 @@ static void sata_enable(struct device *dev) 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 adb9067dbc..cdb1f351d7 100644 --- a/src/southbridge/intel/lynxpoint/serialio.c +++ b/src/southbridge/intel/lynxpoint/serialio.c @@ -220,16 +220,12 @@ static void serialio_init(struct device *dev) } } -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 e78d85d7d1..39003f66a6 100644 --- a/src/southbridge/intel/lynxpoint/smbus.c +++ b/src/southbridge/intel/lynxpoint/smbus.c @@ -55,10 +55,6 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 @@ static struct device_operations smbus_ops = { .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 49a6cfcb27..8684aa9b32 100644 --- a/src/southbridge/intel/lynxpoint/usb_xhci.c +++ b/src/southbridge/intel/lynxpoint/usb_xhci.c @@ -360,16 +360,12 @@ static void usb_xhci_init(struct device *dev) } } -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 */ |