HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Add missing <device/pnp_def.h> ......................................................................
src: Add missing <device/pnp_def.h>
Also remove unused "include <device/pnp_def.h>" in "device/pnp.h".
Change-Id: Ib9903ae456c32db4ba346020659c17c27a939e89 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/device/pnp_device.c M src/ec/hp/kbc1126/early_init.c M src/ec/kontron/it8516e/ec.c M src/include/device/pnp.h M src/mainboard/facebook/monolith/com_init.c M src/mainboard/lenovo/t400/dock.c M src/superio/fintek/common/early_serial.c M src/superio/fintek/f71808a/f71808a_hwm.c M src/superio/fintek/f71863fg/superio.c M src/superio/fintek/f71869ad/f71869ad_hwm.c M src/superio/fintek/f81866d/f81866d_hwm.c M src/superio/fintek/f81866d/f81866d_uart.c M src/superio/ite/common/early_serial.c M src/superio/ite/it8613e/superio.c M src/superio/ite/it8623e/superio.c M src/superio/ite/it8718f/superio.c M src/superio/ite/it8720f/superio.c M src/superio/ite/it8728f/superio.c M src/superio/ite/it8772f/superio.c M src/superio/ite/it8783ef/superio.c M src/superio/ite/it8786e/superio.c M src/superio/nuvoton/common/early_serial.c M src/superio/nuvoton/npcd378/superio.c M src/superio/serverengines/pilot/early_serial.c M src/superio/smsc/kbc1100/superio.c M src/superio/smsc/lpc47m10x/early_serial.c M src/superio/smsc/lpc47m15x/early_serial.c M src/superio/smsc/lpc47n217/superio.c M src/superio/smsc/lpc47n227/superio.c M src/superio/smsc/sch5545/superio.c M src/superio/winbond/common/early_init.c M src/superio/winbond/w83627ehg/superio.c M src/superio/winbond/w83627hf/superio.c 33 files changed, 38 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/45316/1
diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index cd7adf3..1f5a8ee 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -5,6 +5,7 @@ #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/ec/hp/kbc1126/early_init.c b/src/ec/hp/kbc1126/early_init.c index 415ebab..45a7c62 100644 --- a/src/ec/hp/kbc1126/early_init.c +++ b/src/ec/hp/kbc1126/early_init.c @@ -3,6 +3,8 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "ec.h"
void kbc1126_enter_conf(void) diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c index 9af670a..3ace04a 100644 --- a/src/ec/kontron/it8516e/ec.c +++ b/src/ec/kontron/it8516e/ec.c @@ -3,6 +3,7 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <ec/acpi/ec.h> #include <option.h>
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index 800bcc0..ffc5036 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -3,7 +3,6 @@
#include <stdint.h> #include <device/device.h> -#include <device/pnp_def.h> #include <device/pnp_type.h> #include <arch/io.h>
diff --git a/src/mainboard/facebook/monolith/com_init.c b/src/mainboard/facebook/monolith/com_init.c index 98a0232..f0c2157 100644 --- a/src/mainboard/facebook/monolith/com_init.c +++ b/src/mainboard/facebook/monolith/com_init.c @@ -3,6 +3,8 @@ #include <bootblock_common.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "onboard.h"
#define SERIAL_DEV1 PNP_DEV(ITE8528_CMD_PORT, 1) /* ITE8528 UART1 */ diff --git a/src/mainboard/lenovo/t400/dock.c b/src/mainboard/lenovo/t400/dock.c index b8163e71..043f3ac 100644 --- a/src/mainboard/lenovo/t400/dock.c +++ b/src/mainboard/lenovo/t400/dock.c @@ -6,6 +6,7 @@ #include <device/pnp_ops.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <delay.h> #include "dock.h" #include <superio/nsc/pc87382/pc87382.h> diff --git a/src/superio/fintek/common/early_serial.c b/src/superio/fintek/common/early_serial.c index 79af111..843e209 100644 --- a/src/superio/fintek/common/early_serial.c +++ b/src/superio/fintek/common/early_serial.c @@ -22,6 +22,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h> #include "fintek.h"
diff --git a/src/superio/fintek/f71808a/f71808a_hwm.c b/src/superio/fintek/f71808a/f71808a_hwm.c index 340bc30..992a870 100644 --- a/src/superio/fintek/f71808a/f71808a_hwm.c +++ b/src/superio/fintek/f71808a/f71808a_hwm.c @@ -3,6 +3,7 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include "fintek_internal.h" #include "chip.h"
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c index c4e8dc9..11e1600 100644 --- a/src/superio/fintek/f71863fg/superio.c +++ b/src/superio/fintek/f71863fg/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <pc80/keyboard.h>
diff --git a/src/superio/fintek/f71869ad/f71869ad_hwm.c b/src/superio/fintek/f71869ad/f71869ad_hwm.c index 6333ae1..408e0e1 100644 --- a/src/superio/fintek/f71869ad/f71869ad_hwm.c +++ b/src/superio/fintek/f71869ad/f71869ad_hwm.c @@ -3,6 +3,8 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "chip.h" #include "fintek_internal.h"
diff --git a/src/superio/fintek/f81866d/f81866d_hwm.c b/src/superio/fintek/f81866d/f81866d_hwm.c index a7ed96b..41f9d47 100644 --- a/src/superio/fintek/f81866d/f81866d_hwm.c +++ b/src/superio/fintek/f81866d/f81866d_hwm.c @@ -7,6 +7,8 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "fintek_internal.h" #include "chip.h"
diff --git a/src/superio/fintek/f81866d/f81866d_uart.c b/src/superio/fintek/f81866d/f81866d_uart.c index 7d98a7f..23dda77 100644 --- a/src/superio/fintek/f81866d/f81866d_uart.c +++ b/src/superio/fintek/f81866d/f81866d_uart.c @@ -3,6 +3,8 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "fintek_internal.h" #include "f81866d.h"
diff --git a/src/superio/ite/common/early_serial.c b/src/superio/ite/common/early_serial.c index 6b05a38..b26680b 100644 --- a/src/superio/ite/common/early_serial.c +++ b/src/superio/ite/common/early_serial.c @@ -3,6 +3,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h> #include "ite.h"
diff --git a/src/superio/ite/it8613e/superio.c b/src/superio/ite/it8613e/superio.c index 4d12457..83b1858 100644 --- a/src/superio/ite/it8613e/superio.c +++ b/src/superio/ite/it8613e/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <superio/conf_mode.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/ite/it8623e/superio.c b/src/superio/ite/it8623e/superio.c index ca3455a..b7a4b49 100644 --- a/src/superio/ite/it8623e/superio.c +++ b/src/superio/ite/it8623e/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <superio/conf_mode.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index aab554f..47ecb27 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <superio/ite/common/env_ctrl.h> #include <superio/conf_mode.h> diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c index c395953..dd399f8 100644 --- a/src/superio/ite/it8720f/superio.c +++ b/src/superio/ite/it8720f/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <option.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c index 22e6ecb..7943f13 100644 --- a/src/superio/ite/it8728f/superio.c +++ b/src/superio/ite/it8728f/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <pc80/keyboard.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 6672cdc..dc323ae 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <console/console.h> #include <pc80/keyboard.h> #include <arch/io.h> diff --git a/src/superio/ite/it8783ef/superio.c b/src/superio/ite/it8783ef/superio.c index feb373f..36651a1 100644 --- a/src/superio/ite/it8783ef/superio.c +++ b/src/superio/ite/it8783ef/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <superio/conf_mode.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/ite/it8786e/superio.c b/src/superio/ite/it8786e/superio.c index 55fff91..df4b3e7 100644 --- a/src/superio/ite/it8786e/superio.c +++ b/src/superio/ite/it8786e/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <pc80/keyboard.h> #include <superio/conf_mode.h> #include <superio/ite/common/env_ctrl.h> diff --git a/src/superio/nuvoton/common/early_serial.c b/src/superio/nuvoton/common/early_serial.c index 22d882e..b87feea 100644 --- a/src/superio/nuvoton/common/early_serial.c +++ b/src/superio/nuvoton/common/early_serial.c @@ -22,6 +22,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h> #include "nuvoton.h"
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c index b7f98af..949e278 100644 --- a/src/superio/nuvoton/npcd378/superio.c +++ b/src/superio/nuvoton/npcd378/superio.c @@ -4,6 +4,7 @@ #include <console/console.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <option.h> #include <pc80/keyboard.h> #include <superio/conf_mode.h> diff --git a/src/superio/serverengines/pilot/early_serial.c b/src/superio/serverengines/pilot/early_serial.c index e415413..11d6631 100644 --- a/src/superio/serverengines/pilot/early_serial.c +++ b/src/superio/serverengines/pilot/early_serial.c @@ -5,6 +5,8 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> + #include "pilot.h"
/* Pilot uses 0x5A/0xA5 pattern to activate deactivate config access. */ diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index 91457a1..1743624 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -4,6 +4,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/lpc47m10x/early_serial.c b/src/superio/smsc/lpc47m10x/early_serial.c index 38a13f5..7a8e18f 100644 --- a/src/superio/smsc/lpc47m10x/early_serial.c +++ b/src/superio/smsc/lpc47m10x/early_serial.c @@ -3,6 +3,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h> #include "lpc47m10x.h"
diff --git a/src/superio/smsc/lpc47m15x/early_serial.c b/src/superio/smsc/lpc47m15x/early_serial.c index 5921a48..6c78edc 100644 --- a/src/superio/smsc/lpc47m15x/early_serial.c +++ b/src/superio/smsc/lpc47m15x/early_serial.c @@ -5,6 +5,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h>
#include "lpc47m15x.h" diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index a716d19..b721f4b 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -5,6 +5,7 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <console/console.h> #include <assert.h>
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index 376fddb..90a06ff 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -4,6 +4,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <console/console.h> #include <assert.h> #include <pc80/keyboard.h> diff --git a/src/superio/smsc/sch5545/superio.c b/src/superio/smsc/sch5545/superio.c index b6e5308..ce8cdd2 100644 --- a/src/superio/smsc/sch5545/superio.c +++ b/src/superio/smsc/sch5545/superio.c @@ -3,6 +3,7 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <console/console.h> #include <pc80/keyboard.h> diff --git a/src/superio/winbond/common/early_init.c b/src/superio/winbond/common/early_init.c index 4b9497e..2fa0144 100644 --- a/src/superio/winbond/common/early_init.c +++ b/src/superio/winbond/common/early_init.c @@ -22,6 +22,7 @@ #include <arch/io.h> #include <device/pnp_ops.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <stdint.h> #include "winbond.h"
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 7793fa4..8edf0a2 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <superio/hwm5_conf.h> #include <console/console.h> diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index c6d2f57..1469baf 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -2,6 +2,7 @@
#include <device/device.h> #include <device/pnp.h> +#include <device/pnp_def.h> #include <superio/conf_mode.h> #include <superio/hwm5_conf.h> #include <console/console.h>
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Add missing <device/pnp_def.h> ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h File src/include/device/pnp.h:
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h@a6 PS1, Line 6: #include <device/pnp_def.h> I'm not really sure if removing this here is a good idea or not. The main question there is if device/pnp.h should be a meta-include for all pnp-related stuff or not. On one hand i dislike too indirect includes and prefer direct includes, but on the other hand having too many includes for the same area of things adds a bit noise.
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Add missing <device/pnp_def.h> ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h File src/include/device/pnp.h:
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h@a6 PS1, Line 6: #include <device/pnp_def.h>
I'm not really sure if removing this here is a good idea or not. […]
I like the idea to include indirectly <device/pnp_def.h> using <device/pnp.h> , but only when <device/pnp.h> is needed. I mean, including <device/pnp.h> just for "PNP_IDX_*" isn't reasonable.
I'll update current patch and remove redundant <device/pnp_def.h> when <device/pnp.h> is needed.
Hello build bot (Jenkins), Frans Hendriks, Alexander Couzens, Patrick Rudolph, Felix Held, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45316
to look at the new patch set (#2).
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
src: Remove redundant <device/pnp_def.h>
When <device/pnp.h> is needed, 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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/45316/2
Hello build bot (Jenkins), Frans Hendriks, Alexander Couzens, Patrick Rudolph, Felix Held, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45316
to look at the new patch set (#3).
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
src: Remove redundant <device/pnp_def.h>
When <device/pnp.h> is needed, 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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/45316/3
Hello build bot (Jenkins), Frans Hendriks, Alexander Couzens, Patrick Rudolph, Felix Held, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45316
to look at the new patch set (#4).
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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/45316/4
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
Patch Set 5: Code-Review+1
see my comment on the next patch
Hello build bot (Jenkins), Frans Hendriks, Alexander Couzens, Patrick Rudolph, Felix Held, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45316
to look at the new patch set (#6).
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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/45316/6
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
Patch Set 6: Code-Review+1
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45316 )
Change subject: src: Remove redundant <device/pnp_def.h> ......................................................................
Patch Set 6: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h File src/include/device/pnp.h:
https://review.coreboot.org/c/coreboot/+/45316/1/src/include/device/pnp.h@a6 PS1, Line 6: #include <device/pnp_def.h>
I like the idea to include indirectly <device/pnp_def.h> using <device/pnp. […]
Ack
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>
-
Felix Held (Code Review) -
HAOUAS Elyes (Code Review)
-
Wim Vervoorn (Code Review)