[PATCH] hte: Explicitly include correct DT includes

Rob Herring posted 1 patch 2 years, 6 months ago
drivers/hte/hte-tegra194.c | 1 -
drivers/hte/hte.c          | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
[PATCH] hte: Explicitly include correct DT includes
Posted by Rob Herring 2 years, 6 months ago
The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it as merged into the regular platform bus.
As part of that merge prepping Arm DT support 13 years ago, they
"temporarily" include each other. They also include platform_device.h
and of.h. As a result, there's a pretty much random mix of those include
files used throughout the tree. In order to detangle these headers and
replace the implicit includes with struct declarations, users need to
explicitly include the correct includes.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/hte/hte-tegra194.c | 1 -
 drivers/hte/hte.c          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/hte/hte-tegra194.c b/drivers/hte/hte-tegra194.c
index 06ef349a2265..6fe6897047ac 100644
--- a/drivers/hte/hte-tegra194.c
+++ b/drivers/hte/hte-tegra194.c
@@ -12,7 +12,6 @@
 #include <linux/stat.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/hte.h>
 #include <linux/uaccess.h>
diff --git a/drivers/hte/hte.c b/drivers/hte/hte.c
index 67c15724ee78..598a716b7364 100644
--- a/drivers/hte/hte.c
+++ b/drivers/hte/hte.c
@@ -10,12 +10,12 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <linux/hte.h>
 #include <linux/delay.h>
 #include <linux/debugfs.h>
+#include <linux/device.h>
 
 #define HTE_TS_NAME_LEN		10
 
-- 
2.40.1
Re: [PATCH] hte: Explicitly include correct DT includes
Posted by Dipen Patel 2 years, 6 months ago
On 7/14/23 10:46 AM, Rob Herring wrote:
> The DT of_device.h and of_platform.h date back to the separate
> of_platform_bus_type before it as merged into the regular platform bus.
> As part of that merge prepping Arm DT support 13 years ago, they
> "temporarily" include each other. They also include platform_device.h
> and of.h. As a result, there's a pretty much random mix of those include
> files used throughout the tree. In order to detangle these headers and
> replace the implicit includes with struct declarations, users need to
> explicitly include the correct includes.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  drivers/hte/hte-tegra194.c | 1 -
>  drivers/hte/hte.c          | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/hte/hte-tegra194.c b/drivers/hte/hte-tegra194.c
> index 06ef349a2265..6fe6897047ac 100644
> --- a/drivers/hte/hte-tegra194.c
> +++ b/drivers/hte/hte-tegra194.c
> @@ -12,7 +12,6 @@
>  #include <linux/stat.h>
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
> -#include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/hte.h>
>  #include <linux/uaccess.h>
> diff --git a/drivers/hte/hte.c b/drivers/hte/hte.c
> index 67c15724ee78..598a716b7364 100644
> --- a/drivers/hte/hte.c
> +++ b/drivers/hte/hte.c
> @@ -10,12 +10,12 @@
>  #include <linux/err.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
> -#include <linux/of_device.h>
>  #include <linux/mutex.h>
>  #include <linux/uaccess.h>
>  #include <linux/hte.h>
>  #include <linux/delay.h>
>  #include <linux/debugfs.h>
> +#include <linux/device.h>
>  
>  #define HTE_TS_NAME_LEN		10
>  
Acked-by: Dipen Patel <dipenp@nvidia.com>