diff options
| author | Rob Herring <robh@kernel.org> | 2023-07-17 16:54:40 -0600 |
|---|---|---|
| committer | Dinh Nguyen <dinguyen@kernel.org> | 2023-07-20 14:38:38 -0500 |
| commit | 37e2d7d23765c3948e21cb361100f1baeb65f4f3 (patch) | |
| tree | befe8726bfaaade8a6a7df7c7b0dcc9c6ec16374 | |
| parent | 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 (diff) | |
| download | linux-socfpga_mach_updates_v6.6.tar.gz | |
ARM: socfpga: Explicitly include correct DT includessocfpga_update_for_v6.6socfpga_mach_updates_v6.6
The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it was 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.
A couple of other includes are unused and can be dropped too.
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
| -rw-r--r-- | arch/arm/mach-socfpga/l2_cache.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/ocram.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/socfpga.c | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-socfpga/l2_cache.c b/arch/arm/mach-socfpga/l2_cache.c index 99fb953615909..86e011eeb4448 100644 --- a/arch/arm/mach-socfpga/l2_cache.c +++ b/arch/arm/mach-socfpga/l2_cache.c @@ -3,7 +3,7 @@ * Copyright Altera Corporation (C) 2016. All rights reserved. */ #include <linux/io.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/of_address.h> #include "core.h" diff --git a/arch/arm/mach-socfpga/ocram.c b/arch/arm/mach-socfpga/ocram.c index b4d397e834a02..9f1a249debf64 100644 --- a/arch/arm/mach-socfpga/ocram.c +++ b/arch/arm/mach-socfpga/ocram.c @@ -4,10 +4,8 @@ */ #include <linux/delay.h> #include <linux/io.h> -#include <linux/genalloc.h> -#include <linux/module.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include "core.h" diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c index 365c0428b21b6..ab1c08f971f0a 100644 --- a/arch/arm/mach-socfpga/pm.c +++ b/arch/arm/mach-socfpga/pm.c @@ -13,7 +13,9 @@ #include <linux/genalloc.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/suspend.h> #include <asm/suspend.h> #include <asm/fncpy.h> diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index 9e4cb2ffd5802..4332af2d8b862 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -3,13 +3,11 @@ * Copyright (C) 2012-2015 Altera Corporation */ #include <linux/irqchip.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> #include <linux/reboot.h> #include <linux/reset/socfpga.h> -#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/cacheflush.h> |