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/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 +----- 7 files changed, 7 insertions(+), 35 deletions(-) (limited to 'src/southbridge/intel/i82801ix') 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 = { -- cgit v1.2.3