The header ti_k3_common.h uses several definitions in headers it does not include itself, this makes users of this header responsible for including the right headers first. Instead include what we need here. Then go and remove some headers that we do not use from the K3 Remoteproc drivers.
Signed-off-by: Andrew Davis <[email protected]> --- drivers/remoteproc/ti_k3_common.h | 4 ++++ drivers/remoteproc/ti_k3_dsp_remoteproc.c | 3 --- drivers/remoteproc/ti_k3_m4_remoteproc.c | 4 +--- drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 ----- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/remoteproc/ti_k3_common.h b/drivers/remoteproc/ti_k3_common.h index aee3c28dbe510..c8430e42225fe 100644 --- a/drivers/remoteproc/ti_k3_common.h +++ b/drivers/remoteproc/ti_k3_common.h @@ -21,6 +21,10 @@ #ifndef REMOTEPROC_TI_K3_COMMON_H #define REMOTEPROC_TI_K3_COMMON_H +#include <linux/mailbox_client.h> +#include <linux/platform_device.h> +#include <linux/types.h> + #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK (SZ_16M - 1) /** diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c index d6ceea6dc920e..c916a86bc8294 100644 --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c @@ -7,11 +7,8 @@ */ #include <linux/io.h> -#include <linux/mailbox_client.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_reserved_mem.h> -#include <linux/omap-mailbox.h> #include <linux/platform_device.h> #include <linux/remoteproc.h> #include <linux/reset.h> diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c index 3a11fd24eb52b..4c46f4a256a92 100644 --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c @@ -7,10 +7,8 @@ */ #include <linux/io.h> -#include <linux/mailbox_client.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_reserved_mem.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/remoteproc.h> #include <linux/reset.h> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c index b1d04d082e44c..404acc1a9bb7c 100644 --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c @@ -6,17 +6,12 @@ * Suman Anna <[email protected]> */ -#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/interrupt.h> -#include <linux/kernel.h> -#include <linux/mailbox_client.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_reserved_mem.h> #include <linux/of_platform.h> -#include <linux/omap-mailbox.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/remoteproc.h> -- 2.39.2
