7 files changed, 7 insertions, 86 deletions
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index 210263734a..acac67930e 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -72,18 +72,6 @@ struct chip_operations soc_intel_baytrail_ops = {
 	.init = soc_init,
 };
 
-static void pci_set_subsystem(struct device *dev, unsigned vendor,
-			      unsigned 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));
-	}
-}
-
 struct pci_operations soc_pci_ops = {
-	.set_subsystem = &pci_set_subsystem,
+	.set_subsystem = &pci_dev_set_subsystem,
 };
diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index e8fd9d17b7..7617d53644 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -380,22 +380,8 @@ struct chip_operations soc_intel_braswell_ops = {
 	.init = soc_init,
 };
 
-static void pci_set_subsystem(struct device *dev, unsigned int vendor,
-	unsigned int device)
-{
-	printk(BIOS_SPEW, "%s/%s (%s, 0x%04x, 0x%04x)\n",
-			__FILE__, __func__, dev_name(dev), vendor, 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));
-	}
-}
-
 struct pci_operations soc_pci_ops = {
-	.set_subsystem = &pci_set_subsystem,
+	.set_subsystem = &pci_dev_set_subsystem,
 };
 
 /**
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 6383e15e79..caff026f45 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -64,17 +64,6 @@ struct chip_operations soc_intel_broadwell_ops = {
 	.init       = &broadwell_init_pre_device,
 };
 
-static void pci_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 << 16) | vendor);
-}
-
 struct pci_operations broadwell_pci_ops = {
-	.set_subsystem = &pci_set_subsystem
+	.set_subsystem = &pci_dev_set_subsystem
 };
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c
index 53af617a3c..f29c4269b1 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/ehci.c
@@ -33,13 +33,7 @@ static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor,
 	/* Enable writes to protected registers. */
 	pci_write_config8(dev, 0x80, access_cntl | 1);
 
-	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));
-	}
+	pci_dev_set_subsystem(dev, vendor, device);
 
 	/* Restore protection. */
 	pci_write_config8(dev, 0x80, access_cntl);
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index 68bd60c83a..b72bf28a76 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -129,21 +129,8 @@ struct chip_operations soc_intel_denverton_ns_ops = {
 	.final = soc_final
 };
 
-static void soc_set_subsystem(struct device *dev, uint32_t vendor,
-			      uint32_t 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));
-	}
-}
-
 struct pci_operations soc_pci_ops = {
-	.set_subsystem = soc_set_subsystem,
+	.set_subsystem = pci_dev_set_subsystem,
 };
 
 /*
diff --git a/src/soc/intel/fsp_baytrail/chip.c b/src/soc/intel/fsp_baytrail/chip.c
index c74c847512..9e8627993c 100644
--- a/src/soc/intel/fsp_baytrail/chip.c
+++ b/src/soc/intel/fsp_baytrail/chip.c
@@ -74,17 +74,6 @@ struct chip_operations soc_intel_fsp_baytrail_ops = {
 	.init = soc_init,
 };
 
-static void pci_set_subsystem(struct device *dev, unsigned vendor, unsigned 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));
-	}
-}
-
 struct pci_operations soc_pci_ops = {
-	.set_subsystem = &pci_set_subsystem,
+	.set_subsystem = &pci_dev_set_subsystem,
 };
diff --git a/src/soc/intel/fsp_broadwell_de/chip.c b/src/soc/intel/fsp_broadwell_de/chip.c
index 6b1484577d..ba825f4aae 100644
--- a/src/soc/intel/fsp_broadwell_de/chip.c
+++ b/src/soc/intel/fsp_broadwell_de/chip.c
@@ -88,18 +88,6 @@ struct chip_operations soc_intel_fsp_broadwell_de_ops = {
 	.init = soc_init,
 };
 
-static void pci_set_subsystem(struct device *dev, unsigned vendor,
-			      unsigned 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));
-	}
-}
-
 struct pci_operations soc_pci_ops = {
-	.set_subsystem = &pci_set_subsystem,
+	.set_subsystem = &pci_dev_set_subsystem,
 };