Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Vinod Koul
897500c7 62b41b65

+46 -43
+2 -1
drivers/dma/apple-admac.c
··· 10 10 #include <linux/device.h> 11 11 #include <linux/init.h> 12 12 #include <linux/module.h> 13 - #include <linux/of_device.h> 13 + #include <linux/of.h> 14 14 #include <linux/of_dma.h> 15 + #include <linux/platform_device.h> 15 16 #include <linux/reset.h> 16 17 #include <linux/spinlock.h> 17 18 #include <linux/interrupt.h>
+1 -1
drivers/dma/at_hdmac.c
··· 20 20 #include <linux/module.h> 21 21 #include <linux/of.h> 22 22 #include <linux/overflow.h> 23 - #include <linux/of_device.h> 23 + #include <linux/of_platform.h> 24 24 #include <linux/of_dma.h> 25 25 #include <linux/platform_device.h> 26 26 #include <linux/slab.h>
+3 -1
drivers/dma/bcm-sba-raid.c
··· 35 35 #include <linux/mailbox_client.h> 36 36 #include <linux/mailbox/brcm-message.h> 37 37 #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> 39 41 #include <linux/slab.h> 40 42 #include <linux/raid/pq.h> 41 43
+1 -2
drivers/dma/bestcomm/bestcomm.c
··· 14 14 #include <linux/slab.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_address.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/of_irq.h> 19 - #include <linux/of_platform.h> 18 + #include <linux/platform_device.h> 20 19 #include <asm/io.h> 21 20 #include <asm/irq.h> 22 21 #include <asm/mpc52xx.h>
-1
drivers/dma/dma-jz4780.c
··· 13 13 #include <linux/interrupt.h> 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/of_dma.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/slab.h>
-1
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
··· 21 21 #include <linux/kernel.h> 22 22 #include <linux/module.h> 23 23 #include <linux/of.h> 24 - #include <linux/of_device.h> 25 24 #include <linux/of_dma.h> 26 25 #include <linux/platform_device.h> 27 26 #include <linux/pm_runtime.h>
+3 -1
drivers/dma/dw/rzn1-dmamux.c
··· 5 5 * Based on TI crossbar driver written by Peter Ujfalusi <peter.ujfalusi@ti.com> 6 6 */ 7 7 #include <linux/bitops.h> 8 - #include <linux/of_device.h> 8 + #include <linux/of.h> 9 9 #include <linux/of_dma.h> 10 + #include <linux/of_platform.h> 11 + #include <linux/platform_device.h> 10 12 #include <linux/slab.h> 11 13 #include <linux/soc/renesas/r9a06g032-sysctrl.h> 12 14 #include <linux/types.h>
+2 -2
drivers/dma/fsl-qdma.c
··· 13 13 14 14 #include <linux/module.h> 15 15 #include <linux/delay.h> 16 - #include <linux/of_irq.h> 17 - #include <linux/of_platform.h> 16 + #include <linux/of.h> 18 17 #include <linux/of_dma.h> 19 18 #include <linux/dma-mapping.h> 19 + #include <linux/platform_device.h> 20 20 21 21 #include "virt-dma.h" 22 22 #include "fsldma.h"
+2 -1
drivers/dma/fsl_raid.c
··· 60 60 */ 61 61 #include <linux/interrupt.h> 62 62 #include <linux/module.h> 63 + #include <linux/of.h> 63 64 #include <linux/of_irq.h> 64 - #include <linux/of_address.h> 65 65 #include <linux/of_platform.h> 66 + #include <linux/platform_device.h> 66 67 #include <linux/dma-mapping.h> 67 68 #include <linux/dmapool.h> 68 69 #include <linux/dmaengine.h>
+2 -1
drivers/dma/fsldma.c
··· 28 28 #include <linux/delay.h> 29 29 #include <linux/dma-mapping.h> 30 30 #include <linux/dmapool.h> 31 + #include <linux/of.h> 31 32 #include <linux/of_address.h> 32 33 #include <linux/of_irq.h> 33 - #include <linux/of_platform.h> 34 + #include <linux/platform_device.h> 34 35 #include <linux/fsldma.h> 35 36 #include "dmaengine.h" 36 37 #include "fsldma.h"
-1
drivers/dma/img-mdc-dma.c
··· 17 17 #include <linux/mfd/syscon.h> 18 18 #include <linux/module.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_dma.h> 22 21 #include <linux/platform_device.h> 23 22 #include <linux/pm_runtime.h>
+1 -1
drivers/dma/imx-dma.c
··· 21 21 #include <linux/clk.h> 22 22 #include <linux/dmaengine.h> 23 23 #include <linux/module.h> 24 - #include <linux/of_device.h> 24 + #include <linux/of.h> 25 25 #include <linux/of_dma.h> 26 26 27 27 #include <asm/irq.h>
-1
drivers/dma/imx-sdma.c
··· 31 31 #include <linux/dmaengine.h> 32 32 #include <linux/of.h> 33 33 #include <linux/of_address.h> 34 - #include <linux/of_device.h> 35 34 #include <linux/of_dma.h> 36 35 #include <linux/workqueue.h> 37 36
+3 -1
drivers/dma/lpc18xx-dmamux.c
··· 12 12 #include <linux/err.h> 13 13 #include <linux/init.h> 14 14 #include <linux/mfd/syscon.h> 15 - #include <linux/of_device.h> 15 + #include <linux/of.h> 16 16 #include <linux/of_dma.h> 17 + #include <linux/of_platform.h> 18 + #include <linux/platform_device.h> 17 19 #include <linux/regmap.h> 18 20 #include <linux/spinlock.h> 19 21
-1
drivers/dma/mediatek/mtk-cqdma.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 #include <linux/of.h> 21 - #include <linux/of_device.h> 22 21 #include <linux/of_dma.h> 23 22 #include <linux/platform_device.h> 24 23 #include <linux/pm_runtime.h>
-1
drivers/dma/mediatek/mtk-hsdma.c
··· 17 17 #include <linux/list.h> 18 18 #include <linux/module.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_dma.h> 22 21 #include <linux/platform_device.h> 23 22 #include <linux/pm_runtime.h>
-1
drivers/dma/mediatek/mtk-uart-apdma.c
··· 16 16 #include <linux/kernel.h> 17 17 #include <linux/list.h> 18 18 #include <linux/module.h> 19 - #include <linux/of_device.h> 20 19 #include <linux/of_dma.h> 21 20 #include <linux/platform_device.h> 22 21 #include <linux/pm_runtime.h>
+2 -2
drivers/dma/mpc512x_dma.c
··· 36 36 #include <linux/interrupt.h> 37 37 #include <linux/io.h> 38 38 #include <linux/slab.h> 39 + #include <linux/of.h> 39 40 #include <linux/of_address.h> 40 - #include <linux/of_device.h> 41 41 #include <linux/of_irq.h> 42 42 #include <linux/of_dma.h> 43 - #include <linux/of_platform.h> 43 + #include <linux/platform_device.h> 44 44 45 45 #include <linux/random.h> 46 46
-1
drivers/dma/mxs-dma.c
··· 21 21 #include <linux/module.h> 22 22 #include <linux/stmp_device.h> 23 23 #include <linux/of.h> 24 - #include <linux/of_device.h> 25 24 #include <linux/of_dma.h> 26 25 #include <linux/list.h> 27 26 #include <linux/dma/mxs-dma.h>
-1
drivers/dma/nbpfaxi.c
··· 15 15 #include <linux/log2.h> 16 16 #include <linux/module.h> 17 17 #include <linux/of.h> 18 - #include <linux/of_device.h> 19 18 #include <linux/of_dma.h> 20 19 #include <linux/platform_device.h> 21 20 #include <linux/slab.h>
+2 -1
drivers/dma/owl-dma.c
··· 20 20 #include <linux/io.h> 21 21 #include <linux/mm.h> 22 22 #include <linux/module.h> 23 - #include <linux/of_device.h> 23 + #include <linux/of.h> 24 24 #include <linux/of_dma.h> 25 + #include <linux/platform_device.h> 25 26 #include <linux/slab.h> 26 27 #include "virt-dma.h" 27 28
+1 -1
drivers/dma/ppc4xx/adma.c
··· 28 28 #include <linux/of.h> 29 29 #include <linux/of_address.h> 30 30 #include <linux/of_irq.h> 31 - #include <linux/of_platform.h> 31 + #include <linux/platform_device.h> 32 32 #include <asm/dcr.h> 33 33 #include <asm/dcr-regs.h> 34 34 #include "adma.h"
+1 -1
drivers/dma/qcom/hidma.c
··· 45 45 #include <linux/dmaengine.h> 46 46 #include <linux/dma-mapping.h> 47 47 #include <linux/list.h> 48 + #include <linux/mod_devicetable.h> 48 49 #include <linux/module.h> 49 50 #include <linux/platform_device.h> 50 51 #include <linux/slab.h> 51 52 #include <linux/spinlock.h> 52 53 #include <linux/of_dma.h> 53 - #include <linux/of_device.h> 54 54 #include <linux/property.h> 55 55 #include <linux/delay.h> 56 56 #include <linux/acpi.h>
-1
drivers/dma/sh/shdmac.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/notifier.h> 25 25 #include <linux/of.h> 26 - #include <linux/of_device.h> 27 26 #include <linux/platform_device.h> 28 27 #include <linux/pm_runtime.h> 29 28 #include <linux/rculist.h>
+1 -1
drivers/dma/sprd-dma.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/of.h> 17 17 #include <linux/of_dma.h> 18 - #include <linux/of_device.h> 18 + #include <linux/platform_device.h> 19 19 #include <linux/pm_runtime.h> 20 20 #include <linux/slab.h> 21 21
+3 -1
drivers/dma/stm32-dmamux.c
··· 15 15 #include <linux/err.h> 16 16 #include <linux/init.h> 17 17 #include <linux/module.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 #include <linux/of_dma.h> 20 + #include <linux/of_platform.h> 21 + #include <linux/platform_device.h> 20 22 #include <linux/pm_runtime.h> 21 23 #include <linux/reset.h> 22 24 #include <linux/slab.h>
-1
drivers/dma/stm32-mdma.c
··· 24 24 #include <linux/log2.h> 25 25 #include <linux/module.h> 26 26 #include <linux/of.h> 27 - #include <linux/of_device.h> 28 27 #include <linux/of_dma.h> 29 28 #include <linux/platform_device.h> 30 29 #include <linux/pm_runtime.h>
+1 -1
drivers/dma/sun6i-dma.c
··· 14 14 #include <linux/dmapool.h> 15 15 #include <linux/interrupt.h> 16 16 #include <linux/module.h> 17 + #include <linux/of.h> 17 18 #include <linux/of_dma.h> 18 - #include <linux/of_device.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/reset.h> 21 21 #include <linux/slab.h>
+1 -1
drivers/dma/tegra186-gpc-dma.c
··· 13 13 #include <linux/iopoll.h> 14 14 #include <linux/minmax.h> 15 15 #include <linux/module.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/of_dma.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/reset.h>
-1
drivers/dma/tegra20-apb-dma.c
··· 17 17 #include <linux/mm.h> 18 18 #include <linux/module.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_dma.h> 22 21 #include <linux/platform_device.h> 23 22 #include <linux/pm.h>
+2 -1
drivers/dma/tegra210-adma.c
··· 8 8 #include <linux/clk.h> 9 9 #include <linux/iopoll.h> 10 10 #include <linux/module.h> 11 - #include <linux/of_device.h> 11 + #include <linux/of.h> 12 12 #include <linux/of_dma.h> 13 13 #include <linux/of_irq.h> 14 + #include <linux/platform_device.h> 14 15 #include <linux/pm_runtime.h> 15 16 #include <linux/slab.h> 16 17
+3 -2
drivers/dma/ti/dma-crossbar.c
··· 3 3 * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com 4 4 * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> 5 5 */ 6 + #include <linux/platform_device.h> 6 7 #include <linux/slab.h> 7 8 #include <linux/err.h> 8 9 #include <linux/init.h> 9 10 #include <linux/list.h> 10 11 #include <linux/io.h> 11 - #include <linux/of_address.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/of_dma.h> 14 + #include <linux/of_platform.h> 14 15 15 16 #define TI_XBAR_DRA7 0 16 17 #define TI_XBAR_AM335X 1
-1
drivers/dma/ti/edma.c
··· 20 20 #include <linux/of_dma.h> 21 21 #include <linux/of_irq.h> 22 22 #include <linux/of_address.h> 23 - #include <linux/of_device.h> 24 23 #include <linux/pm_runtime.h> 25 24 26 25 #include <linux/platform_data/edma.h>
+2
drivers/dma/ti/k3-udma-private.c
··· 3 3 * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com 4 4 * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> 5 5 */ 6 + #include <linux/of.h> 7 + #include <linux/of_platform.h> 6 8 7 9 int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thread) 8 10 {
-1
drivers/dma/ti/k3-udma.c
··· 20 20 #include <linux/sys_soc.h> 21 21 #include <linux/of.h> 22 22 #include <linux/of_dma.h> 23 - #include <linux/of_device.h> 24 23 #include <linux/of_irq.h> 25 24 #include <linux/workqueue.h> 26 25 #include <linux/completion.h>
+1 -1
drivers/dma/ti/omap-dma.c
··· 16 16 #include <linux/platform_device.h> 17 17 #include <linux/slab.h> 18 18 #include <linux/spinlock.h> 19 + #include <linux/of.h> 19 20 #include <linux/of_dma.h> 20 - #include <linux/of_device.h> 21 21 22 22 #include "../virt-dma.h" 23 23
+2 -1
drivers/dma/xgene-dma.c
··· 18 18 #include <linux/interrupt.h> 19 19 #include <linux/io.h> 20 20 #include <linux/irq.h> 21 + #include <linux/mod_devicetable.h> 21 22 #include <linux/module.h> 22 - #include <linux/of_device.h> 23 + #include <linux/platform_device.h> 23 24 24 25 #include "dmaengine.h" 25 26
+2 -2
drivers/dma/xilinx/xilinx_dma.c
··· 41 41 #include <linux/io.h> 42 42 #include <linux/iopoll.h> 43 43 #include <linux/module.h> 44 - #include <linux/of_address.h> 44 + #include <linux/of.h> 45 45 #include <linux/of_dma.h> 46 - #include <linux/of_platform.h> 47 46 #include <linux/of_irq.h> 47 + #include <linux/platform_device.h> 48 48 #include <linux/slab.h> 49 49 #include <linux/clk.h> 50 50 #include <linux/io-64-nonatomic-lo-hi.h>
+2 -1
drivers/dma/xilinx/zynqmp_dma.c
··· 11 11 #include <linux/interrupt.h> 12 12 #include <linux/io.h> 13 13 #include <linux/module.h> 14 + #include <linux/of.h> 14 15 #include <linux/of_dma.h> 15 - #include <linux/of_platform.h> 16 + #include <linux/platform_device.h> 16 17 #include <linux/slab.h> 17 18 #include <linux/clk.h> 18 19 #include <linux/io-64-nonatomic-lo-hi.h>