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

mmc: 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>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230718143054.1065288-1-robh@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Rob Herring and committed by
Ulf Hansson
c62da8a8 a5d8de1c

+20 -30
-1
drivers/mmc/host/atmel-mci.c
··· 18 18 #include <linux/ioport.h> 19 19 #include <linux/module.h> 20 20 #include <linux/of.h> 21 - #include <linux/of_device.h> 22 21 #include <linux/of_gpio.h> 23 22 #include <linux/platform_device.h> 24 23 #include <linux/scatterlist.h>
+2
drivers/mmc/host/cavium-octeon.c
··· 13 13 #include <linux/mmc/mmc.h> 14 14 #include <linux/mmc/slot-gpio.h> 15 15 #include <linux/module.h> 16 + #include <linux/of.h> 16 17 #include <linux/of_platform.h> 18 + #include <linux/platform_device.h> 17 19 #include <asm/octeon/octeon.h> 18 20 #include "cavium.h" 19 21
+1
drivers/mmc/host/cavium-thunderx.c
··· 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_platform.h> 17 + #include <linux/platform_device.h> 17 18 #include <linux/pci.h> 18 19 #include "cavium.h" 19 20
-1
drivers/mmc/host/davinci_mmc.c
··· 21 21 #include <linux/dma-mapping.h> 22 22 #include <linux/mmc/mmc.h> 23 23 #include <linux/of.h> 24 - #include <linux/of_device.h> 25 24 #include <linux/mmc/slot-gpio.h> 26 25 #include <linux/interrupt.h> 27 26
+1 -1
drivers/mmc/host/meson-gx-mmc.c
··· 11 11 #include <linux/delay.h> 12 12 #include <linux/device.h> 13 13 #include <linux/iopoll.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/ioport.h> 17 17 #include <linux/dma-mapping.h>
+1 -3
drivers/mmc/host/mtk-sd.c
··· 12 12 #include <linux/iopoll.h> 13 13 #include <linux/ioport.h> 14 14 #include <linux/irq.h> 15 - #include <linux/of_address.h> 16 - #include <linux/of_device.h> 17 - #include <linux/of_irq.h> 15 + #include <linux/of.h> 18 16 #include <linux/of_gpio.h> 19 17 #include <linux/pinctrl/consumer.h> 20 18 #include <linux/platform_device.h>
-1
drivers/mmc/host/mxcmmc.c
··· 31 31 #include <linux/dmaengine.h> 32 32 #include <linux/types.h> 33 33 #include <linux/of.h> 34 - #include <linux/of_device.h> 35 34 #include <linux/of_dma.h> 36 35 #include <linux/mmc/slot-gpio.h> 37 36
-1
drivers/mmc/host/mxs-mmc.c
··· 11 11 #include <linux/init.h> 12 12 #include <linux/ioport.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/platform_device.h> 16 15 #include <linux/delay.h> 17 16 #include <linux/interrupt.h>
+2 -1
drivers/mmc/host/owl-mmc.c
··· 16 16 #include <linux/interrupt.h> 17 17 #include <linux/mmc/host.h> 18 18 #include <linux/mmc/slot-gpio.h> 19 + #include <linux/mod_devicetable.h> 19 20 #include <linux/module.h> 20 - #include <linux/of_platform.h> 21 + #include <linux/platform_device.h> 21 22 #include <linux/reset.h> 22 23 #include <linux/spinlock.h> 23 24
-1
drivers/mmc/host/pxamci.c
··· 30 30 #include <linux/gpio/consumer.h> 31 31 #include <linux/gfp.h> 32 32 #include <linux/of.h> 33 - #include <linux/of_device.h> 34 33 #include <linux/soc/pxa/cpu.h> 35 34 36 35 #include <linux/sizes.h>
+2 -1
drivers/mmc/host/renesas_sdhi_internal_dmac.c
··· 15 15 #include <linux/mmc/host.h> 16 16 #include <linux/mod_devicetable.h> 17 17 #include <linux/module.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 + #include <linux/platform_device.h> 19 20 #include <linux/pagemap.h> 20 21 #include <linux/scatterlist.h> 21 22 #include <linux/sys_soc.h>
+2 -1
drivers/mmc/host/renesas_sdhi_sys_dmac.c
··· 15 15 #include <linux/mmc/host.h> 16 16 #include <linux/mod_devicetable.h> 17 17 #include <linux/module.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 + #include <linux/platform_device.h> 19 20 #include <linux/pagemap.h> 20 21 #include <linux/scatterlist.h> 21 22 #include <linux/sys_soc.h>
-1
drivers/mmc/host/sdhci-bcm-kona.c
··· 11 11 #include <linux/clk.h> 12 12 #include <linux/regulator/consumer.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/mmc/slot-gpio.h> 16 15 17 16 #include "sdhci-pltfm.h"
+1 -1
drivers/mmc/host/sdhci-cadence.c
··· 11 11 #include <linux/mmc/host.h> 12 12 #include <linux/mmc/mmc.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 14 + #include <linux/platform_device.h> 15 15 #include <linux/reset.h> 16 16 17 17 #include "sdhci-pltfm.h"
+1 -1
drivers/mmc/host/sdhci-esdhc-imx.c
··· 22 22 #include <linux/mmc/sdio.h> 23 23 #include <linux/mmc/slot-gpio.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 25 + #include <linux/platform_device.h> 26 26 #include <linux/pinctrl/consumer.h> 27 27 #include <linux/pm_runtime.h> 28 28 #include "sdhci-cqhci.h"
+1 -1
drivers/mmc/host/sdhci-iproc.c
··· 10 10 #include <linux/module.h> 11 11 #include <linux/mmc/host.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 13 + #include <linux/platform_device.h> 14 14 #include "sdhci-pltfm.h" 15 15 16 16 struct sdhci_iproc_data {
+1 -1
drivers/mmc/host/sdhci-msm.c
··· 6 6 */ 7 7 8 8 #include <linux/module.h> 9 - #include <linux/of_device.h> 10 9 #include <linux/delay.h> 11 10 #include <linux/mmc/mmc.h> 12 11 #include <linux/pm_runtime.h> ··· 14 15 #include <linux/iopoll.h> 15 16 #include <linux/regulator/consumer.h> 16 17 #include <linux/interconnect.h> 18 + #include <linux/of.h> 17 19 #include <linux/pinctrl/consumer.h> 18 20 #include <linux/reset.h> 19 21
+2 -2
drivers/mmc/host/sdhci-of-arasan.c
··· 18 18 #include <linux/clk-provider.h> 19 19 #include <linux/mfd/syscon.h> 20 20 #include <linux/module.h> 21 - #include <linux/of_device.h> 21 + #include <linux/of.h> 22 + #include <linux/platform_device.h> 22 23 #include <linux/phy/phy.h> 23 24 #include <linux/regmap.h> 24 25 #include <linux/reset.h> 25 - #include <linux/of.h> 26 26 #include <linux/firmware/xlnx-zynqmp.h> 27 27 28 28 #include "cqhci.h"
+1 -1
drivers/mmc/host/sdhci-of-at91.c
··· 17 17 #include <linux/mmc/slot-gpio.h> 18 18 #include <linux/module.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 20 + #include <linux/platform_device.h> 21 21 #include <linux/pm.h> 22 22 #include <linux/pm_runtime.h> 23 23
+1 -1
drivers/mmc/host/sdhci-of-dwcmshc.c
··· 14 14 #include <linux/kernel.h> 15 15 #include <linux/module.h> 16 16 #include <linux/of.h> 17 - #include <linux/of_device.h> 17 + #include <linux/platform_device.h> 18 18 #include <linux/reset.h> 19 19 #include <linux/sizes.h> 20 20
+1 -1
drivers/mmc/host/sdhci-of-sparx5.c
··· 13 13 #include <linux/delay.h> 14 14 #include <linux/module.h> 15 15 #include <linux/regmap.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/mfd/syscon.h> 18 17 #include <linux/dma-mapping.h> 18 + #include <linux/of.h> 19 19 20 20 #include "sdhci-pltfm.h" 21 21
-1
drivers/mmc/host/sdhci-omap.c
··· 11 11 #include <linux/mmc/slot-gpio.h> 12 12 #include <linux/module.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/of_irq.h> 16 15 #include <linux/platform_device.h> 17 16 #include <linux/pm_runtime.h>
-1
drivers/mmc/host/sdhci-pxav2.c
··· 19 19 #include <linux/platform_data/pxa_sdhci.h> 20 20 #include <linux/slab.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/mmc/sdio.h> 24 23 #include <linux/mmc/mmc.h> 25 24 #include <linux/pinctrl/consumer.h>
-1
drivers/mmc/host/sdhci-s3c.c
··· 20 20 #include <linux/gpio.h> 21 21 #include <linux/module.h> 22 22 #include <linux/of.h> 23 - #include <linux/of_device.h> 24 23 #include <linux/of_gpio.h> 25 24 #include <linux/pm.h> 26 25 #include <linux/pm_runtime.h>
-1
drivers/mmc/host/sdhci-sprd.c
··· 11 11 #include <linux/iopoll.h> 12 12 #include <linux/module.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/of_gpio.h> 16 15 #include <linux/pinctrl/consumer.h> 17 16 #include <linux/platform_device.h>
-1
drivers/mmc/host/sdhci-tegra.c
··· 19 19 #include <linux/mmc/mmc.h> 20 20 #include <linux/mmc/slot-gpio.h> 21 21 #include <linux/module.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/of.h> 24 23 #include <linux/pinctrl/consumer.h> 25 24 #include <linux/platform_device.h>
-1
drivers/mmc/host/sh_mmcif.c
··· 46 46 #include <linux/mmc/slot-gpio.h> 47 47 #include <linux/mod_devicetable.h> 48 48 #include <linux/mutex.h> 49 - #include <linux/of_device.h> 50 49 #include <linux/pagemap.h> 51 50 #include <linux/platform_data/sh_mmcif.h> 52 51 #include <linux/platform_device.h>
-1
drivers/mmc/host/uniphier-sd.c
··· 13 13 #include <linux/mmc/host.h> 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/pinctrl/consumer.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/regmap.h>
-1
drivers/mmc/host/wmt-sdmmc.c
··· 21 21 #include <linux/of.h> 22 22 #include <linux/of_address.h> 23 23 #include <linux/of_irq.h> 24 - #include <linux/of_device.h> 25 24 26 25 #include <linux/mmc/host.h> 27 26 #include <linux/mmc/mmc.h>