Skip to content

Commit 897500c

Browse files
robherringvinodkoul
authored andcommitted
dmaengine: 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/20230718143138.1066177-1-robh@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 62b41b6 commit 897500c

39 files changed

Lines changed: 46 additions & 43 deletions

drivers/dma/apple-admac.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
#include <linux/device.h>
1111
#include <linux/init.h>
1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/of_dma.h>
15+
#include <linux/platform_device.h>
1516
#include <linux/reset.h>
1617
#include <linux/spinlock.h>
1718
#include <linux/interrupt.h>

drivers/dma/at_hdmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/module.h>
2121
#include <linux/of.h>
2222
#include <linux/overflow.h>
23-
#include <linux/of_device.h>
23+
#include <linux/of_platform.h>
2424
#include <linux/of_dma.h>
2525
#include <linux/platform_device.h>
2626
#include <linux/slab.h>

drivers/dma/bcm-sba-raid.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
#include <linux/mailbox_client.h>
3636
#include <linux/mailbox/brcm-message.h>
3737
#include <linux/module.h>
38-
#include <linux/of_device.h>
38+
#include <linux/of.h>
39+
#include <linux/of_platform.h>
40+
#include <linux/platform_device.h>
3941
#include <linux/slab.h>
4042
#include <linux/raid/pq.h>
4143

drivers/dma/bestcomm/bestcomm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
#include <linux/slab.h>
1515
#include <linux/of.h>
1616
#include <linux/of_address.h>
17-
#include <linux/of_device.h>
1817
#include <linux/of_irq.h>
19-
#include <linux/of_platform.h>
18+
#include <linux/platform_device.h>
2019
#include <asm/io.h>
2120
#include <asm/irq.h>
2221
#include <asm/mpc52xx.h>

drivers/dma/dma-jz4780.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/interrupt.h>
1414
#include <linux/module.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
1716
#include <linux/of_dma.h>
1817
#include <linux/platform_device.h>
1918
#include <linux/slab.h>

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <linux/kernel.h>
2222
#include <linux/module.h>
2323
#include <linux/of.h>
24-
#include <linux/of_device.h>
2524
#include <linux/of_dma.h>
2625
#include <linux/platform_device.h>
2726
#include <linux/pm_runtime.h>

drivers/dma/dw/rzn1-dmamux.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
* Based on TI crossbar driver written by Peter Ujfalusi <peter.ujfalusi@ti.com>
66
*/
77
#include <linux/bitops.h>
8-
#include <linux/of_device.h>
8+
#include <linux/of.h>
99
#include <linux/of_dma.h>
10+
#include <linux/of_platform.h>
11+
#include <linux/platform_device.h>
1012
#include <linux/slab.h>
1113
#include <linux/soc/renesas/r9a06g032-sysctrl.h>
1214
#include <linux/types.h>

drivers/dma/fsl-qdma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
#include <linux/module.h>
1515
#include <linux/delay.h>
16-
#include <linux/of_irq.h>
17-
#include <linux/of_platform.h>
16+
#include <linux/of.h>
1817
#include <linux/of_dma.h>
1918
#include <linux/dma-mapping.h>
19+
#include <linux/platform_device.h>
2020

2121
#include "virt-dma.h"
2222
#include "fsldma.h"

drivers/dma/fsl_raid.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@
6060
*/
6161
#include <linux/interrupt.h>
6262
#include <linux/module.h>
63+
#include <linux/of.h>
6364
#include <linux/of_irq.h>
64-
#include <linux/of_address.h>
6565
#include <linux/of_platform.h>
66+
#include <linux/platform_device.h>
6667
#include <linux/dma-mapping.h>
6768
#include <linux/dmapool.h>
6869
#include <linux/dmaengine.h>

drivers/dma/fsldma.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
#include <linux/delay.h>
2929
#include <linux/dma-mapping.h>
3030
#include <linux/dmapool.h>
31+
#include <linux/of.h>
3132
#include <linux/of_address.h>
3233
#include <linux/of_irq.h>
33-
#include <linux/of_platform.h>
34+
#include <linux/platform_device.h>
3435
#include <linux/fsldma.h>
3536
#include "dmaengine.h"
3637
#include "fsldma.h"

0 commit comments

Comments
 (0)