From 7cba1c486beb9287dc563784904d2a8e0235340a Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Tue, 31 Jan 2023 07:39:43 +0100
Subject: treewide: Remove duplicated include <device/pci.h>

<device/pci.h> chain-includes <device/pci_def.h> & <device/pci_type.h>.

Change-Id: I4e5999443e81ee1c4b1fd69942050b47f21f42f8
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72626
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/alderlake/pmutil.c               | 1 -
 src/soc/intel/apollolake/pmutil.c              | 1 -
 src/soc/intel/baytrail/hda.c                   | 1 -
 src/soc/intel/broadwell/pch/me.c               | 1 -
 src/soc/intel/broadwell/pch/pch.c              | 1 -
 src/soc/intel/broadwell/pch/pcie.c             | 1 -
 src/soc/intel/broadwell/pch/pmutil.c           | 1 -
 src/soc/intel/broadwell/pch/power_state.c      | 1 -
 src/soc/intel/cannonlake/pmutil.c              | 1 -
 src/soc/intel/cannonlake/romstage/fsp_params.c | 1 -
 src/soc/intel/common/block/fast_spi/fast_spi.c | 1 -
 src/soc/intel/common/block/i2c/i2c.c           | 1 -
 src/soc/intel/common/block/irq/irq.c           | 1 -
 src/soc/intel/common/block/pcie/pcie.c         | 1 -
 src/soc/intel/common/block/smbus/tco.c         | 1 -
 src/soc/intel/common/block/spi/spi.c           | 2 --
 src/soc/intel/common/block/uart/uart.c         | 1 -
 src/soc/intel/common/block/usb4/usb4.c         | 1 -
 src/soc/intel/denverton_ns/soc_util.c          | 1 -
 src/soc/intel/elkhartlake/pmutil.c             | 1 -
 src/soc/intel/jasperlake/pmutil.c              | 1 -
 src/soc/intel/meteorlake/pmutil.c              | 1 -
 src/soc/intel/quark/include/soc/pci_devs.h     | 1 -
 src/soc/intel/quark/romstage/report_platform.c | 1 -
 src/soc/intel/quark/uart.c                     | 1 -
 src/soc/intel/skylake/pmutil.c                 | 1 -
 src/soc/intel/tigerlake/pmutil.c               | 1 -
 27 files changed, 28 deletions(-)

(limited to 'src/soc/intel')

diff --git a/src/soc/intel/alderlake/pmutil.c b/src/soc/intel/alderlake/pmutil.c
index 3e9f71f78d..0c508ff4f9 100644
--- a/src/soc/intel/alderlake/pmutil.c
+++ b/src/soc/intel/alderlake/pmutil.c
@@ -18,7 +18,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 41f806fc53..b799d0253e 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -9,7 +9,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index 6bebf05467..46fbce17a5 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -2,7 +2,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
diff --git a/src/soc/intel/broadwell/pch/me.c b/src/soc/intel/broadwell/pch/me.c
index 08917fd6bb..6973c723c1 100644
--- a/src/soc/intel/broadwell/pch/me.c
+++ b/src/soc/intel/broadwell/pch/me.c
@@ -15,7 +15,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <stdlib.h>
 #include <string.h>
 #include <delay.h>
diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c
index c2ff5b0b6c..98fbc46e4e 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/rcba.h>
diff --git a/src/soc/intel/broadwell/pch/pcie.c b/src/soc/intel/broadwell/pch/pcie.c
index 61d6962a82..ef03eee4d3 100644
--- a/src/soc/intel/broadwell/pch/pcie.c
+++ b/src/soc/intel/broadwell/pch/pcie.c
@@ -6,7 +6,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pciexp.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <soc/lpc.h>
diff --git a/src/soc/intel/broadwell/pch/pmutil.c b/src/soc/intel/broadwell/pch/pmutil.c
index 931dcc9764..4ba30b4ec6 100644
--- a/src/soc/intel/broadwell/pch/pmutil.c
+++ b/src/soc/intel/broadwell/pch/pmutil.c
@@ -11,7 +11,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <console/console.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
diff --git a/src/soc/intel/broadwell/pch/power_state.c b/src/soc/intel/broadwell/pch/power_state.c
index b1ab622b72..842878b483 100644
--- a/src/soc/intel/broadwell/pch/power_state.c
+++ b/src/soc/intel/broadwell/pch/power_state.c
@@ -6,7 +6,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c
index 512b49b6ae..681068d5f3 100644
--- a/src/soc/intel/cannonlake/pmutil.c
+++ b/src/soc/intel/cannonlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c
index 842c8fb7d0..737e7c399d 100644
--- a/src/soc/intel/cannonlake/romstage/fsp_params.c
+++ b/src/soc/intel/cannonlake/romstage/fsp_params.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
-#include <device/pci_def.h>
 #include <device/pci.h>
 #include <cpu/x86/msr.h>
 #include <console/console.h>
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index a2c49915ea..ed2e8f2b39 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -8,7 +8,6 @@
 #include <device/mmio.h>
 #include <assert.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index 481ba7bc02..70c7e18bac 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <drivers/i2c/designware/dw_i2c.h>
 #include <intelblocks/cfg.h>
diff --git a/src/soc/intel/common/block/irq/irq.c b/src/soc/intel/common/block/irq/irq.c
index 724061ee8c..4ffe138798 100644
--- a/src/soc/intel/common/block/irq/irq.c
+++ b/src/soc/intel/common/block/irq/irq.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/irq.h>
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index dd0b0ef989..c8a958d70d 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/pciexp.h>
diff --git a/src/soc/intel/common/block/smbus/tco.c b/src/soc/intel/common/block/smbus/tco.c
index 12b176c094..1f1a85c5b3 100644
--- a/src/soc/intel/common/block/smbus/tco.c
+++ b/src/soc/intel/common/block/smbus/tco.c
@@ -6,7 +6,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <intelblocks/gpmr.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index f6a211ba75..93278f186c 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -7,10 +7,8 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_type.h>
 #include <device/spi.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 0ca3361b3e..76e4bc9a68 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -6,7 +6,6 @@
 #include <console/uart.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <intelblocks/irq.h>
diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c
index d62496e4d8..a90a35af95 100644
--- a/src/soc/intel/common/block/usb4/usb4.c
+++ b/src/soc/intel/common/block/usb4/usb4.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <intelblocks/tcss.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index b4c707d3ec..dbe924b40e 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -4,7 +4,6 @@
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/device.h>
 #include <string.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/elkhartlake/pmutil.c b/src/soc/intel/elkhartlake/pmutil.c
index 4203beefcc..adc3056638 100644
--- a/src/soc/intel/elkhartlake/pmutil.c
+++ b/src/soc/intel/elkhartlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/jasperlake/pmutil.c b/src/soc/intel/jasperlake/pmutil.c
index 744a2fb576..f52cc43272 100644
--- a/src/soc/intel/jasperlake/pmutil.c
+++ b/src/soc/intel/jasperlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/meteorlake/pmutil.c b/src/soc/intel/meteorlake/pmutil.c
index 9ed87f801d..8b377c0b9e 100644
--- a/src/soc/intel/meteorlake/pmutil.c
+++ b/src/soc/intel/meteorlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index 2c6a53229b..11594f5148 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -4,7 +4,6 @@
 #define _QUARK_PCI_DEVS_H_
 
 #include <device/pci.h>
-#include <device/pci_def.h>
 
 /* DEVICE 0 (Memory Controller Hub) */
 #define MC_BDF			PCI_DEV(PCI_BUS_NUMBER_QNC, MC_DEV, MC_FUN)
diff --git a/src/soc/intel/quark/romstage/report_platform.c b/src/soc/intel/quark/romstage/report_platform.c
index 3b4e36718a..7a49148cd0 100644
--- a/src/soc/intel/quark/romstage/report_platform.c
+++ b/src/soc/intel/quark/romstage/report_platform.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c
index c045c34a71..0047664f15 100644
--- a/src/soc/intel/quark/uart.c
+++ b/src/soc/intel/quark/uart.c
@@ -2,7 +2,6 @@
 
 #include <console/uart.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index c31fb06567..5152237547 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -13,7 +13,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/tigerlake/pmutil.c b/src/soc/intel/tigerlake/pmutil.c
index 3c870c5278..f8a7b19a8b 100644
--- a/src/soc/intel/tigerlake/pmutil.c
+++ b/src/soc/intel/tigerlake/pmutil.c
@@ -18,7 +18,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
-- 
cgit v1.2.3