src: Use pci_dev_ops_pci where applicable
Change-Id: Ie004a94a49fc8f53c370412bee1c3e7eacbf8beb
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41944
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 094da2a..a15b045 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -10,16 +10,12 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations hda_audio_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = hda_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -9,16 +9,12 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations ide_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = ide_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 8a1f250..89c9a6b 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -333,10 +333,6 @@
}
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations lpc_ops = {
.read_resources = hudson_lpc_read_resources,
.set_resources = hudson_lpc_set_resources,
@@ -347,7 +343,7 @@
.init = lpc_init,
.final = lpc_final,
.scan_bus = scan_static_bus,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
.acpi_name = lpc_acpi_name,
};
static const struct pci_driver lpc_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 39e6752..a6b1464 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -129,16 +129,13 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
static struct device_operations smbus_ops = {
.read_resources = hudson_sm_read_resources,
.set_resources = hudson_sm_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = sm_init,
.scan_bus = scan_smbus,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
.ops_smbus_bus = &lops_smbus_bus,
};
static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index ff691cf..1175f08 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -6,10 +6,6 @@
#include <device/pci_ehci.h>
#include "hudson.h"
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static void usb_init(struct device *dev)
{
}
@@ -19,7 +15,7 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = usb_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver usb_0_driver __pci_driver = {
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index de91a9a..d57ce00 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -102,10 +102,6 @@
printk(BIOS_DEBUG, "AHCI/RAID controller initialized\n");
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static void lpc_init(struct device *dev)
{
printk(BIOS_DEBUG, "SB800 - Late.c - %s - Start.\n", __func__);
@@ -154,7 +150,7 @@
#endif
.init = lpc_init,
.scan_bus = scan_static_bus,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
.acpi_name = lpc_acpi_name,
};
@@ -169,7 +165,7 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = ahci_raid_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver ahci_driver __pci_driver = {
@@ -193,7 +189,7 @@
.read_resources = pci_ehci_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
/*
@@ -222,7 +218,7 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver azalia_driver __pci_driver = {
@@ -236,7 +232,7 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver gec_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index 3c98c66..f11eee5 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -16,16 +16,12 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations hda_audio_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = hda_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver hdaaudio_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index 3b18bd4..8ba7a12 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.c
@@ -9,16 +9,12 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations ide_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = ide_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const struct pci_driver ide_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index ebc9de5..c884f20 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -349,10 +349,6 @@
}
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static struct device_operations lpc_ops = {
.read_resources = hudson_lpc_read_resources,
.set_resources = hudson_lpc_set_resources,
@@ -363,7 +359,7 @@
.init = lpc_init,
.final = lpc_final,
.scan_bus = scan_static_bus,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
.acpi_name = lpc_acpi_name,
};
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index 268d7e4..6f9e03c 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -94,16 +94,13 @@
{
}
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
static struct device_operations smbus_ops = {
.read_resources = hudson_sm_read_resources,
.set_resources = hudson_sm_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = sm_init,
.scan_bus = scan_smbus,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
.ops_smbus_bus = &lops_smbus_bus,
};
static const struct pci_driver smbus_driver __pci_driver = {
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index 3318349..fecae74 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -6,10 +6,6 @@
#include <device/pci_ehci.h>
#include "hudson.h"
-static struct pci_operations lops_pci = {
- .set_subsystem = pci_dev_set_subsystem,
-};
-
static void usb_init(struct device *dev)
{
}
@@ -19,7 +15,7 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = usb_init,
- .ops_pci = &lops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {