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/soc/amd/common/block/iommu/iommu.c | 6 +----- src/soc/amd/common/block/smbus/sm.c | 5 +---- src/soc/amd/picasso/acp.c | 6 +----- src/soc/amd/picasso/usb.c | 6 +----- src/soc/amd/stoneyridge/usb.c | 6 +----- 5 files changed, 5 insertions(+), 24 deletions(-) (limited to 'src/soc/amd') 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[] = { -- cgit v1.2.3