Skip to content

Commit 37e2d7d

Browse files
robherringDinh Nguyen
authored andcommitted
ARM: socfpga: Explicitly include correct DT includes
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 <[email protected]> Signed-off-by: Dinh Nguyen <[email protected]>
1 parent 06c2afb commit 37e2d7d

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

arch/arm/mach-socfpga/l2_cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright Altera Corporation (C) 2016. All rights reserved.
44
*/
55
#include <linux/io.h>
6-
#include <linux/of_platform.h>
6+
#include <linux/of.h>
77
#include <linux/of_address.h>
88

99
#include "core.h"

arch/arm/mach-socfpga/ocram.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
*/
55
#include <linux/delay.h>
66
#include <linux/io.h>
7-
#include <linux/genalloc.h>
8-
#include <linux/module.h>
7+
#include <linux/of.h>
98
#include <linux/of_address.h>
10-
#include <linux/of_platform.h>
119

1210
#include "core.h"
1311

arch/arm/mach-socfpga/pm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
#include <linux/genalloc.h>
1414
#include <linux/init.h>
1515
#include <linux/io.h>
16+
#include <linux/of.h>
1617
#include <linux/of_platform.h>
18+
#include <linux/platform_device.h>
1719
#include <linux/suspend.h>
1820
#include <asm/suspend.h>
1921
#include <asm/fncpy.h>

arch/arm/mach-socfpga/socfpga.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
* Copyright (C) 2012-2015 Altera Corporation
44
*/
55
#include <linux/irqchip.h>
6+
#include <linux/of.h>
67
#include <linux/of_address.h>
7-
#include <linux/of_irq.h>
8-
#include <linux/of_platform.h>
98
#include <linux/reboot.h>
109
#include <linux/reset/socfpga.h>
1110

12-
#include <asm/hardware/cache-l2x0.h>
1311
#include <asm/mach/arch.h>
1412
#include <asm/mach/map.h>
1513
#include <asm/cacheflush.h>

0 commit comments

Comments
 (0)