summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/broadwell/adsp.c2
-rw-r--r--src/soc/intel/broadwell/chip.c4
-rw-r--r--src/soc/intel/broadwell/gma.c2
-rw-r--r--src/soc/intel/broadwell/hda.c2
-rw-r--r--src/soc/intel/broadwell/include/soc/ramstage.h2
-rw-r--r--src/soc/intel/broadwell/lpc.c2
-rw-r--r--src/soc/intel/broadwell/me.c2
-rw-r--r--src/soc/intel/broadwell/minihd.c2
-rw-r--r--src/soc/intel/broadwell/sata.c2
-rw-r--r--src/soc/intel/broadwell/serialio.c2
-rw-r--r--src/soc/intel/broadwell/smbus.c2
-rw-r--r--src/soc/intel/broadwell/systemagent.c2
-rw-r--r--src/soc/intel/broadwell/xhci.c2
13 files changed, 11 insertions, 17 deletions
diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c
index 15858e1024..220ad6f269 100644
--- a/src/soc/intel/broadwell/adsp.c
+++ b/src/soc/intel/broadwell/adsp.c
@@ -128,7 +128,7 @@ static struct device_operations adsp_ops = {
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = adsp_init,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 16afcce60c..9358c78b62 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -43,7 +43,3 @@ struct chip_operations soc_intel_broadwell_ops = {
.enable_dev = &broadwell_enable,
.init = &broadwell_init_pre_device,
};
-
-struct pci_operations broadwell_pci_ops = {
- .set_subsystem = &pci_dev_set_subsystem
-};
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index 8ccd2783c7..c77f5c4476 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -590,7 +590,7 @@ static struct device_operations igd_ops = {
.set_resources = &pci_dev_set_resources,
.enable_resources = &pci_dev_enable_resources,
.init = &igd_init,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
.acpi_fill_ssdt = gma_generate_ssdt,
};
diff --git a/src/soc/intel/broadwell/hda.c b/src/soc/intel/broadwell/hda.c
index 16408252d5..04390d1342 100644
--- a/src/soc/intel/broadwell/hda.c
+++ b/src/soc/intel/broadwell/hda.c
@@ -139,7 +139,7 @@ static struct device_operations hda_ops = {
.enable_resources = &pci_dev_enable_resources,
.init = &hda_init,
.enable = &hda_enable,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/include/soc/ramstage.h b/src/soc/intel/broadwell/include/soc/ramstage.h
index 18a23e1341..0b6ef0d61b 100644
--- a/src/soc/intel/broadwell/include/soc/ramstage.h
+++ b/src/soc/intel/broadwell/include/soc/ramstage.h
@@ -16,6 +16,4 @@ void broadwell_run_reference_code(void);
static inline void broadwell_run_reference_code(void) { }
#endif
-extern struct pci_operations broadwell_pci_ops;
-
#endif
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index ccd372cbc9..dd4e15c80a 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -652,7 +652,7 @@ static struct device_operations device_ops = {
.write_acpi_tables = broadwell_write_acpi_tables,
.init = &lpc_init,
.scan_bus = &scan_static_bus,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/me.c
index 7449902575..80ffe2b9ac 100644
--- a/src/soc/intel/broadwell/me.c
+++ b/src/soc/intel/broadwell/me.c
@@ -1041,7 +1041,7 @@ static struct device_operations device_ops = {
.enable = &intel_me_enable,
.init = &intel_me_init,
.final = &intel_me_finalize,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c
index a39c496ce5..6d96eb363d 100644
--- a/src/soc/intel/broadwell/minihd.c
+++ b/src/soc/intel/broadwell/minihd.c
@@ -95,7 +95,7 @@ static struct device_operations minihd_ops = {
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = minihd_init,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/sata.c
index b1d953ef73..c9168325e2 100644
--- a/src/soc/intel/broadwell/sata.c
+++ b/src/soc/intel/broadwell/sata.c
@@ -270,7 +270,7 @@ static struct device_operations sata_ops = {
.enable_resources = pci_dev_enable_resources,
.init = sata_init,
.enable = sata_enable,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/serialio.c b/src/soc/intel/broadwell/serialio.c
index dbe194a223..766f5dd048 100644
--- a/src/soc/intel/broadwell/serialio.c
+++ b/src/soc/intel/broadwell/serialio.c
@@ -273,7 +273,7 @@ static struct device_operations device_ops = {
.set_resources = &serialio_set_resources,
.enable_resources = &pci_dev_enable_resources,
.init = &serialio_init,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/smbus.c
index 31715c7182..0bc2c2b234 100644
--- a/src/soc/intel/broadwell/smbus.c
+++ b/src/soc/intel/broadwell/smbus.c
@@ -79,7 +79,7 @@ static struct device_operations smbus_ops = {
.scan_bus = scan_smbus,
.init = pch_smbus_init,
.ops_smbus_bus = &lops_smbus_bus,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index 91816be680..0837e0ce27 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -435,7 +435,7 @@ static struct device_operations systemagent_ops = {
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = systemagent_init,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short systemagent_ids[] = {
diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c
index 526781d1c4..baaf5ba6e6 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/xhci.c
@@ -201,7 +201,7 @@ static struct device_operations usb_xhci_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .ops_pci = &broadwell_pci_ops,
+ .ops_pci = &pci_dev_ops_pci,
.init = xhci_init,
};