summaryrefslogtreecommitdiff
path: root/src/northbridge/intel/haswell
diff options
context:
space:
mode:
authorSubrata Banik <subrata.banik@intel.com>2019-03-20 14:29:47 +0530
committerPatrick Georgi <pgeorgi@google.com>2019-03-21 16:18:05 +0000
commit4a0f07166f0f0b6eb799e2670b47ce31d0cfc60b (patch)
tree6a4ca1aad66f7ca8d2886f7a607132269b82f663 /src/northbridge/intel/haswell
parent6520ec0650c4af616e1da92a5d90263e895f50ca (diff)
downloadcoreboot-4a0f07166f0f0b6eb799e2670b47ce31d0cfc60b.tar.xz
{northbridge, soc, southbridge}/intel: Make use of pci_dev_set_subsystem()
This patch removes local definitions of sub_system function and make use of common function pci_dev_set_subsystem(). Change-Id: I91982597fdf586ab514bec3d8e4d09f2565fe56d Signed-off-by: Subrata Banik <subrata.banik@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31982 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: David Guckian Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/northbridge/intel/haswell')
-rw-r--r--src/northbridge/intel/haswell/gma.c14
-rw-r--r--src/northbridge/intel/haswell/minihd.c14
-rw-r--r--src/northbridge/intel/haswell/northbridge.c14
3 files changed, 3 insertions, 39 deletions
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 0fd0228268..1b2430f849 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -499,18 +499,6 @@ static void gma_func0_init(struct device *dev)
intel_gma_restore_opregion();
}
-static void gma_set_subsystem(struct device *dev, unsigned int vendor,
- unsigned int device)
-{
- if (!vendor || !device) {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- pci_read_config32(dev, PCI_VENDOR_ID));
- } else {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- ((device & 0xffff) << 16) | (vendor & 0xffff));
- }
-}
-
const struct i915_gpu_controller_info *
intel_gma_get_controller_info(void)
{
@@ -558,7 +546,7 @@ gma_write_acpi_tables(struct device *const dev, unsigned long current,
}
static struct pci_operations gma_pci_ops = {
- .set_subsystem = gma_set_subsystem,
+ .set_subsystem = pci_dev_set_subsystem,
};
static struct device_operations gma_func0_ops = {
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index 9a1df0f63e..994296adb0 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -103,20 +103,8 @@ static void minihd_init(struct device *dev)
}
}
-static void minihd_set_subsystem(struct device *dev, unsigned int vendor,
- unsigned int device)
-{
- if (!vendor || !device) {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- pci_read_config32(dev, PCI_VENDOR_ID));
- } else {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- ((device & 0xffff) << 16) | (vendor & 0xffff));
- }
-}
-
static struct pci_operations minihd_pci_ops = {
- .set_subsystem = minihd_set_subsystem,
+ .set_subsystem = pci_dev_set_subsystem,
};
static struct device_operations minihd_ops = {
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 2b7afa8172..2fd5959ee0 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -468,18 +468,6 @@ static void disable_devices(void)
pci_write_config32(host_dev, DEVEN, deven);
}
-static void intel_set_subsystem(struct device *dev, unsigned int vendor,
- unsigned int device)
-{
- if (!vendor || !device) {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- pci_read_config32(dev, PCI_VENDOR_ID));
- } else {
- pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- ((device & 0xffff) << 16) | (vendor & 0xffff));
- }
-}
-
static void northbridge_init(struct device *dev)
{
u8 bios_reset_cpl, pair;
@@ -510,7 +498,7 @@ static void northbridge_init(struct device *dev)
}
static struct pci_operations intel_pci_ops = {
- .set_subsystem = intel_set_subsystem,
+ .set_subsystem = pci_dev_set_subsystem,
};
static struct device_operations mc_ops = {