These headers aren't used by the files they're included in, so drop them. The memconsole file uses memremap() though, so include io.h there so that the include is explicit.
Cc: Wei-Ning Huang <wnhu...@chromium.org> Cc: Julius Werner <jwer...@chromium.org> Cc: Brian Norris <briannor...@chromium.org> Cc: Samuel Holland <sam...@sholland.org> Cc: Guenter Roeck <gro...@chromium.org> Signed-off-by: Stephen Boyd <swb...@chromium.org> --- drivers/firmware/google/coreboot_table.h | 1 - drivers/firmware/google/memconsole-coreboot.c | 1 + drivers/firmware/google/memconsole.c | 1 - drivers/firmware/google/vpd_decode.c | 2 -- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/firmware/google/coreboot_table.h b/drivers/firmware/google/coreboot_table.h index 054fa9374c59..d33c139447f6 100644 --- a/drivers/firmware/google/coreboot_table.h +++ b/drivers/firmware/google/coreboot_table.h @@ -21,7 +21,6 @@ #define __COREBOOT_TABLE_H #include <linux/device.h> -#include <linux/io.h> /* Coreboot table header structure */ struct coreboot_table_header { diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c index ab0fe93b88ad..f8a66354e5a4 100644 --- a/drivers/firmware/google/memconsole-coreboot.c +++ b/drivers/firmware/google/memconsole-coreboot.c @@ -16,6 +16,7 @@ */ #include <linux/device.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c index 968135025e4f..c8156db0e3a0 100644 --- a/drivers/firmware/google/memconsole.c +++ b/drivers/firmware/google/memconsole.c @@ -15,7 +15,6 @@ * GNU General Public License for more details. */ -#include <linux/init.h> #include <linux/sysfs.h> #include <linux/kobject.h> #include <linux/module.h> diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/google/vpd_decode.c index 943acaa8aa76..f8c9143472df 100644 --- a/drivers/firmware/google/vpd_decode.c +++ b/drivers/firmware/google/vpd_decode.c @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -#include <linux/export.h> - #include "vpd_decode.h" static int vpd_decode_len(const s32 max_len, const u8 *in, -- Sent by a computer through tubes