From 4b683b85a8ecb87b128ac13a5f2af67532903917 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Tue, 15 Sep 2020 07:45:17 +0200
Subject: 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>
---
 src/device/pnp_device.c                      | 1 -
 src/include/device/pnp.h                     | 1 +
 src/include/device/pnp_ops.h                 | 1 -
 src/superio/common/ssdt.c                    | 1 -
 src/superio/nsc/pc87417/early_init.c         | 1 -
 src/superio/serverengines/pilot/early_init.c | 2 +-
 src/superio/smsc/kbc1100/early_init.c        | 1 -
 src/superio/winbond/w83627uhg/superio.c      | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c
index 9fa032e4a9..afe6948a3a 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 7340bbfe9c..cf809d027c 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 18b35befcd..0d63f1bdde 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 9a94aaf1d5..47fbf0cb8e 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 3c1f4dd038..c0bb2efa27 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 201e9a70b0..d974afef25 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 875db4288a..2210c2bf59 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 00bea8cf03..4b54bac98d 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>
-- 
cgit v1.2.3