From 1fc0edd9fe6b8072a87dce769789119e81af978b Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 31 May 2020 00:03:28 +0200 Subject: src: Use pci_dev_ops_pci where applicable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/southbridge/intel/bd82x6x/azalia.c | 6 +----- src/southbridge/intel/bd82x6x/lpc.c | 6 +----- src/southbridge/intel/bd82x6x/me.c | 6 +----- src/southbridge/intel/bd82x6x/me_8.x.c | 6 +----- src/southbridge/intel/bd82x6x/pci.c | 6 +----- src/southbridge/intel/bd82x6x/pcie.c | 6 +----- src/southbridge/intel/bd82x6x/sata.c | 6 +----- src/southbridge/intel/bd82x6x/smbus.c | 6 +----- src/southbridge/intel/bd82x6x/usb_xhci.c | 6 +----- src/southbridge/intel/i82801gx/ac97.c | 8 ++------ src/southbridge/intel/i82801gx/azalia.c | 6 +----- src/southbridge/intel/i82801gx/ide.c | 6 +----- src/southbridge/intel/i82801gx/lpc.c | 6 +----- src/southbridge/intel/i82801gx/pci.c | 6 +----- src/southbridge/intel/i82801gx/pcie.c | 6 +----- src/southbridge/intel/i82801gx/sata.c | 6 +----- src/southbridge/intel/i82801gx/smbus.c | 6 +----- src/southbridge/intel/i82801gx/usb.c | 6 +----- src/southbridge/intel/i82801ix/hdaudio.c | 6 +----- src/southbridge/intel/i82801ix/lpc.c | 6 +----- src/southbridge/intel/i82801ix/pci.c | 6 +----- src/southbridge/intel/i82801ix/pcie.c | 6 +----- src/southbridge/intel/i82801ix/sata.c | 6 +----- src/southbridge/intel/i82801ix/smbus.c | 6 +----- src/southbridge/intel/i82801ix/thermal.c | 6 +----- src/southbridge/intel/i82801jx/hdaudio.c | 6 +----- src/southbridge/intel/i82801jx/lpc.c | 6 +----- src/southbridge/intel/i82801jx/pci.c | 6 +----- src/southbridge/intel/i82801jx/pcie.c | 6 +----- src/southbridge/intel/i82801jx/sata.c | 6 +----- src/southbridge/intel/i82801jx/smbus.c | 6 +----- src/southbridge/intel/i82801jx/thermal.c | 6 +----- src/southbridge/intel/ibexpeak/azalia.c | 6 +----- src/southbridge/intel/ibexpeak/lpc.c | 6 +----- src/southbridge/intel/ibexpeak/me.c | 6 +----- src/southbridge/intel/ibexpeak/sata.c | 6 +----- src/southbridge/intel/ibexpeak/smbus.c | 6 +----- src/southbridge/intel/ibexpeak/thermal.c | 6 +----- src/southbridge/intel/lynxpoint/azalia.c | 6 +----- src/southbridge/intel/lynxpoint/lpc.c | 6 +----- src/southbridge/intel/lynxpoint/me_9.x.c | 6 +----- src/southbridge/intel/lynxpoint/pcie.c | 6 +----- src/southbridge/intel/lynxpoint/sata.c | 6 +----- src/southbridge/intel/lynxpoint/serialio.c | 6 +----- src/southbridge/intel/lynxpoint/smbus.c | 6 +----- src/southbridge/intel/lynxpoint/usb_xhci.c | 6 +----- 46 files changed, 47 insertions(+), 231 deletions(-) (limited to 'src/southbridge/intel') 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 */ -- cgit v1.2.3