Skip to content

Commit e9803aa

Browse files
robherringJassiBrar
authored andcommitted
mailbox: 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> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent 4aac24c commit e9803aa

16 files changed

+15
-10
lines changed

drivers/mailbox/arm_mhu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/io.h>
1313
#include <linux/mailbox_controller.h>
1414
#include <linux/module.h>
15+
#include <linux/of.h>
1516

1617
#define INTR_STAT_OFS 0x0
1718
#define INTR_SET_OFS 0x8

drivers/mailbox/arm_mhu_db.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/mailbox_controller.h>
1616
#include <linux/module.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
1918

2019
#define INTR_STAT_OFS 0x0
2120
#define INTR_SET_OFS 0x8

drivers/mailbox/hi3660-mailbox.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/iopoll.h>
1212
#include <linux/mailbox_controller.h>
1313
#include <linux/module.h>
14+
#include <linux/of.h>
1415
#include <linux/platform_device.h>
1516
#include <linux/slab.h>
1617

drivers/mailbox/hi6220-mailbox.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/kfifo.h>
1616
#include <linux/mailbox_controller.h>
1717
#include <linux/module.h>
18+
#include <linux/of.h>
1819
#include <linux/platform_device.h>
1920
#include <linux/slab.h>
2021

drivers/mailbox/imx-mailbox.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <linux/kernel.h>
1515
#include <linux/mailbox_controller.h>
1616
#include <linux/module.h>
17-
#include <linux/of_device.h>
17+
#include <linux/of.h>
18+
#include <linux/platform_device.h>
1819
#include <linux/pm_runtime.h>
1920
#include <linux/suspend.h>
2021
#include <linux/slab.h>

drivers/mailbox/mailbox-mpfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/module.h>
1515
#include <linux/kernel.h>
1616
#include <linux/interrupt.h>
17+
#include <linux/mod_devicetable.h>
1718
#include <linux/platform_device.h>
1819
#include <linux/mailbox_controller.h>
1920
#include <soc/microchip/mpfs.h>

drivers/mailbox/mailbox.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/bitops.h>
1818
#include <linux/mailbox_client.h>
1919
#include <linux/mailbox_controller.h>
20+
#include <linux/of.h>
2021

2122
#include "mailbox.h"
2223

drivers/mailbox/mtk-adsp-mailbox.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#include <linux/kernel.h>
1111
#include <linux/mailbox_controller.h>
1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
14+
#include <linux/platform_device.h>
1415
#include <linux/slab.h>
1516

1617
struct mtk_adsp_mbox_priv {

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/platform_device.h>
1616
#include <linux/mailbox_controller.h>
1717
#include <linux/mailbox/mtk-cmdq-mailbox.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of.h>
1919

2020
#define CMDQ_OP_CODE_MASK (0xff << CMDQ_OP_CODE_SHIFT)
2121
#define CMDQ_NUM_CMD(t) (t->cmd_buf_size / CMDQ_INST_SIZE)

drivers/mailbox/omap-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/kfifo.h>
1717
#include <linux/err.h>
1818
#include <linux/module.h>
19-
#include <linux/of_device.h>
19+
#include <linux/of.h>
2020
#include <linux/platform_device.h>
2121
#include <linux/pm_runtime.h>
2222
#include <linux/omap-mailbox.h>

0 commit comments

Comments
 (0)