Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46697 )
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
soc/intel/broadwell: Drop `broadwell_pci_ops`
This is essentially a duplicate of `pci_dev_ops_pci`.
Change-Id: I06a21ebd759c35910cd753d3079ea7902868e89d Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/broadwell/adsp.c M src/soc/intel/broadwell/chip.c M src/soc/intel/broadwell/gma.c M src/soc/intel/broadwell/hda.c M src/soc/intel/broadwell/include/soc/ramstage.h M src/soc/intel/broadwell/lpc.c M src/soc/intel/broadwell/me.c M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/sata.c M src/soc/intel/broadwell/serialio.c M src/soc/intel/broadwell/smbus.c M src/soc/intel/broadwell/systemagent.c M src/soc/intel/broadwell/xhci.c 13 files changed, 11 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/46697/1
diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c index 15858e1..220ad6f 100644 --- a/src/soc/intel/broadwell/adsp.c +++ b/src/soc/intel/broadwell/adsp.c @@ -128,7 +128,7 @@ .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 16afcce..9358c78 100644 --- a/src/soc/intel/broadwell/chip.c +++ b/src/soc/intel/broadwell/chip.c @@ -43,7 +43,3 @@ .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 8ccd278..c77f5c4 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -590,7 +590,7 @@ .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 1640825..04390d1 100644 --- a/src/soc/intel/broadwell/hda.c +++ b/src/soc/intel/broadwell/hda.c @@ -139,7 +139,7 @@ .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 18a23e1..0b6ef0d 100644 --- a/src/soc/intel/broadwell/include/soc/ramstage.h +++ b/src/soc/intel/broadwell/include/soc/ramstage.h @@ -16,6 +16,4 @@ 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 ccd372c..dd4e15c 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -652,7 +652,7 @@ .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 7449902..80ffe2b 100644 --- a/src/soc/intel/broadwell/me.c +++ b/src/soc/intel/broadwell/me.c @@ -1041,7 +1041,7 @@ .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 a39c496..6d96eb3 100644 --- a/src/soc/intel/broadwell/minihd.c +++ b/src/soc/intel/broadwell/minihd.c @@ -95,7 +95,7 @@ .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 b1d953e..c9168325 100644 --- a/src/soc/intel/broadwell/sata.c +++ b/src/soc/intel/broadwell/sata.c @@ -270,7 +270,7 @@ .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 dbe194a..766f5dd 100644 --- a/src/soc/intel/broadwell/serialio.c +++ b/src/soc/intel/broadwell/serialio.c @@ -273,7 +273,7 @@ .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 31715c7..0bc2c2b 100644 --- a/src/soc/intel/broadwell/smbus.c +++ b/src/soc/intel/broadwell/smbus.c @@ -79,7 +79,7 @@ .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 91816be..0837e0c 100644 --- a/src/soc/intel/broadwell/systemagent.c +++ b/src/soc/intel/broadwell/systemagent.c @@ -435,7 +435,7 @@ .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 526781d..baaf5ba 100644 --- a/src/soc/intel/broadwell/xhci.c +++ b/src/soc/intel/broadwell/xhci.c @@ -201,7 +201,7 @@ .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, };
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46697
to look at the new patch set (#4).
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
soc/intel/broadwell: Drop `broadwell_pci_ops`
This is essentially a duplicate of `pci_dev_ops_pci`.
Change-Id: I06a21ebd759c35910cd753d3079ea7902868e89d Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/broadwell/adsp.c M src/soc/intel/broadwell/chip.c M src/soc/intel/broadwell/gma.c M src/soc/intel/broadwell/hda.c M src/soc/intel/broadwell/include/soc/ramstage.h M src/soc/intel/broadwell/lpc.c M src/soc/intel/broadwell/me.c M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/sata.c M src/soc/intel/broadwell/serialio.c M src/soc/intel/broadwell/smbus.c M src/soc/intel/broadwell/systemagent.c M src/soc/intel/broadwell/xhci.c 13 files changed, 11 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/46697/4
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46697
to look at the new patch set (#5).
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
soc/intel/broadwell: Drop `broadwell_pci_ops`
This is essentially a duplicate of `pci_dev_ops_pci`.
Change-Id: I06a21ebd759c35910cd753d3079ea7902868e89d Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/broadwell/adsp.c M src/soc/intel/broadwell/chip.c M src/soc/intel/broadwell/gma.c M src/soc/intel/broadwell/hda.c M src/soc/intel/broadwell/include/soc/ramstage.h M src/soc/intel/broadwell/lpc.c M src/soc/intel/broadwell/me.c M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/sata.c M src/soc/intel/broadwell/serialio.c M src/soc/intel/broadwell/smbus.c M src/soc/intel/broadwell/systemagent.c M src/soc/intel/broadwell/xhci.c 13 files changed, 11 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/46697/5
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46697
to look at the new patch set (#7).
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
soc/intel/broadwell: Drop `broadwell_pci_ops`
This is essentially a duplicate of `pci_dev_ops_pci`.
Change-Id: I06a21ebd759c35910cd753d3079ea7902868e89d Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/broadwell/adsp.c M src/soc/intel/broadwell/chip.c M src/soc/intel/broadwell/gma.c M src/soc/intel/broadwell/hda.c M src/soc/intel/broadwell/include/soc/ramstage.h M src/soc/intel/broadwell/lpc.c M src/soc/intel/broadwell/me.c M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/sata.c M src/soc/intel/broadwell/serialio.c M src/soc/intel/broadwell/smbus.c M src/soc/intel/broadwell/systemagent.c M src/soc/intel/broadwell/xhci.c 13 files changed, 11 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/46697/7
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46697 )
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
Patch Set 8: Code-Review+2
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46697 )
Change subject: soc/intel/broadwell: Drop `broadwell_pci_ops` ......................................................................
soc/intel/broadwell: Drop `broadwell_pci_ops`
This is essentially a duplicate of `pci_dev_ops_pci`.
Change-Id: I06a21ebd759c35910cd753d3079ea7902868e89d Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/46697 Reviewed-by: Nico Huber nico.h@gmx.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/broadwell/adsp.c M src/soc/intel/broadwell/chip.c M src/soc/intel/broadwell/gma.c M src/soc/intel/broadwell/hda.c M src/soc/intel/broadwell/include/soc/ramstage.h M src/soc/intel/broadwell/lpc.c M src/soc/intel/broadwell/me.c M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/sata.c M src/soc/intel/broadwell/serialio.c M src/soc/intel/broadwell/smbus.c M src/soc/intel/broadwell/systemagent.c M src/soc/intel/broadwell/xhci.c 13 files changed, 11 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c index 15858e1..220ad6f 100644 --- a/src/soc/intel/broadwell/adsp.c +++ b/src/soc/intel/broadwell/adsp.c @@ -128,7 +128,7 @@ .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 16afcce..9358c78 100644 --- a/src/soc/intel/broadwell/chip.c +++ b/src/soc/intel/broadwell/chip.c @@ -43,7 +43,3 @@ .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 8ccd278..c77f5c4 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -590,7 +590,7 @@ .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 1640825..04390d1 100644 --- a/src/soc/intel/broadwell/hda.c +++ b/src/soc/intel/broadwell/hda.c @@ -139,7 +139,7 @@ .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 18a23e1..0b6ef0d 100644 --- a/src/soc/intel/broadwell/include/soc/ramstage.h +++ b/src/soc/intel/broadwell/include/soc/ramstage.h @@ -16,6 +16,4 @@ 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 ccd372c..dd4e15c 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -652,7 +652,7 @@ .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 7449902..80ffe2b 100644 --- a/src/soc/intel/broadwell/me.c +++ b/src/soc/intel/broadwell/me.c @@ -1041,7 +1041,7 @@ .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 a39c496..6d96eb3 100644 --- a/src/soc/intel/broadwell/minihd.c +++ b/src/soc/intel/broadwell/minihd.c @@ -95,7 +95,7 @@ .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 b1d953e..c9168325 100644 --- a/src/soc/intel/broadwell/sata.c +++ b/src/soc/intel/broadwell/sata.c @@ -270,7 +270,7 @@ .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 dbe194a..766f5dd 100644 --- a/src/soc/intel/broadwell/serialio.c +++ b/src/soc/intel/broadwell/serialio.c @@ -273,7 +273,7 @@ .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 31715c7..0bc2c2b 100644 --- a/src/soc/intel/broadwell/smbus.c +++ b/src/soc/intel/broadwell/smbus.c @@ -79,7 +79,7 @@ .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 91816be..0837e0c 100644 --- a/src/soc/intel/broadwell/systemagent.c +++ b/src/soc/intel/broadwell/systemagent.c @@ -435,7 +435,7 @@ .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 526781d..baaf5ba 100644 --- a/src/soc/intel/broadwell/xhci.c +++ b/src/soc/intel/broadwell/xhci.c @@ -201,7 +201,7 @@ .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, };
-
Angel Pons (Code Review) -
Nico Huber (Code Review)