Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
src: Remove redundant <device/pnp_def.h>
When <device/pnp.h> is needed, it is supposed to provide <device/pnp_def.h>. So remove redundant <device/pnp_def.h> includes. I'll remove also <device/pnp_type.h> in a separate patch.
Change-Id: Ib9903ae456c32db4ba346020659c17c27a939e89 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/45316 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Wim Vervoorn wvervoorn@eltan.com Reviewed-by: Felix Held felix-coreboot@felixheld.de --- M src/device/pnp_device.c M src/include/device/pnp.h M src/include/device/pnp_ops.h M src/superio/common/ssdt.c M src/superio/nsc/pc87417/early_init.c M src/superio/serverengines/pilot/early_init.c M src/superio/smsc/kbc1100/early_init.c M src/superio/winbond/w83627uhg/superio.c 8 files changed, 2 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved Wim Vervoorn: Looks good to me, but someone else must approve
diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index 9fa032e..afe6948 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/pnp_def.h>
/* PNP config mode wrappers */
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index 7340bbf..cf809d0 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -3,6 +3,7 @@
#include <stdint.h> #include <device/device.h> +/* When <device/pnp.h> is needed, it supposed to provide <device/pnp_{def,type}.h> */ #include <device/pnp_def.h> #include <device/pnp_type.h> #include <arch/io.h> diff --git a/src/include/device/pnp_ops.h b/src/include/device/pnp_ops.h index 18b35be..0d63f1b 100644 --- a/src/include/device/pnp_ops.h +++ b/src/include/device/pnp_ops.h @@ -6,7 +6,6 @@ #include <stdint.h> #include <arch/io.h> #include <device/pnp.h> -#include <device/pnp_def.h> #include <device/pnp_type.h>
#if ENV_PNP_SIMPLE_DEVICE diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c index 9a94aaf..47fbf0c 100644 --- a/src/superio/common/ssdt.c +++ b/src/superio/common/ssdt.c @@ -6,7 +6,6 @@ #include <device/pnp.h> #include <acpi/acpigen.h> #include <acpi/acpi.h> -#include <device/pnp_def.h> #include <console/console.h> #include <types.h> #include <string.h> diff --git a/src/superio/nsc/pc87417/early_init.c b/src/superio/nsc/pc87417/early_init.c index 3c1f4dd..c0bb2ef 100644 --- a/src/superio/nsc/pc87417/early_init.c +++ b/src/superio/nsc/pc87417/early_init.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/io.h> -#include <device/pnp_def.h> #include <device/pnp_ops.h> #include <device/pnp.h> #include <stdint.h> diff --git a/src/superio/serverengines/pilot/early_init.c b/src/superio/serverengines/pilot/early_init.c index 201e9a7..d974afe 100644 --- a/src/superio/serverengines/pilot/early_init.c +++ b/src/superio/serverengines/pilot/early_init.c @@ -7,7 +7,7 @@ #include <device/pnp_ops.h> #include <console/console.h> #include <device/pnp.h> -#include <device/pnp_def.h> + #include "pilot.h"
/* diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c index 875db42..2210c2b 100644 --- a/src/superio/smsc/kbc1100/early_init.c +++ b/src/superio/smsc/kbc1100/early_init.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> -#include <device/pnp_def.h> #include <stdint.h>
#include "kbc1100.h" diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c index 00bea8c..4b54bac 100644 --- a/src/superio/winbond/w83627uhg/superio.c +++ b/src/superio/winbond/w83627uhg/superio.c @@ -2,7 +2,6 @@
#include <device/device.h> #include <device/pnp.h> -#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <stdint.h> #include <pc80/keyboard.h>