Skip to content

Commit 5df5b2e

Browse files
robherringarndb
authored andcommitted
soc: fsl: 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 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> Link: https://lore.kernel.org/r/20230803-dt-header-cleanups-for-soc-v2-23-d8de2cc88bff@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 1c37c34 commit 5df5b2e

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/soc/fsl/dpaa2-console.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
#define pr_fmt(fmt) "dpaa2-console: " fmt
1010

1111
#include <linux/module.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
1313
#include <linux/of_address.h>
1414
#include <linux/miscdevice.h>
15+
#include <linux/platform_device.h>
1516
#include <linux/uaccess.h>
1617
#include <linux/slab.h>
1718
#include <linux/fs.h>

drivers/soc/fsl/qe/qe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
#include <linux/iopoll.h>
2626
#include <linux/crc32.h>
2727
#include <linux/mod_devicetable.h>
28-
#include <linux/of_platform.h>
28+
#include <linux/of.h>
29+
#include <linux/platform_device.h>
2930
#include <soc/fsl/qe/immap_qe.h>
3031
#include <soc/fsl/qe/qe.h>
3132

drivers/soc/fsl/qe/qe_common.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/genalloc.h>
1717
#include <linux/init.h>
1818
#include <linux/list.h>
19-
#include <linux/of_device.h>
2019
#include <linux/spinlock.h>
2120
#include <linux/export.h>
2221
#include <linux/of.h>

drivers/soc/fsl/qe/qe_tdm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
*/
1010
#include <linux/io.h>
1111
#include <linux/kernel.h>
12-
#include <linux/of_address.h>
13-
#include <linux/of_irq.h>
14-
#include <linux/of_platform.h>
12+
#include <linux/of.h>
1513
#include <soc/fsl/qe/qe_tdm.h>
1614

1715
static int set_tdm_framer(const char *tdm_framer_type)

0 commit comments

Comments
 (0)