On Tue, 18 Jul 2023 at 16:31, Rob Herring <robh@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> v2:
> - Fix double include of of.h
> ---
> drivers/mmc/host/atmel-mci.c | 1 -
> drivers/mmc/host/cavium-octeon.c | 2 ++
> drivers/mmc/host/cavium-thunderx.c | 1 +
> drivers/mmc/host/davinci_mmc.c | 1 -
> drivers/mmc/host/meson-gx-mmc.c | 2 +-
> drivers/mmc/host/mtk-sd.c | 4 +---
> drivers/mmc/host/mxcmmc.c | 1 -
> drivers/mmc/host/mxs-mmc.c | 1 -
> drivers/mmc/host/owl-mmc.c | 3 ++-
> drivers/mmc/host/pxamci.c | 1 -
> drivers/mmc/host/renesas_sdhi_internal_dmac.c | 3 ++-
> drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 ++-
> drivers/mmc/host/sdhci-bcm-kona.c | 1 -
> drivers/mmc/host/sdhci-cadence.c | 2 +-
> drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
> drivers/mmc/host/sdhci-iproc.c | 2 +-
> drivers/mmc/host/sdhci-msm.c | 2 +-
> drivers/mmc/host/sdhci-of-arasan.c | 4 ++--
> drivers/mmc/host/sdhci-of-at91.c | 2 +-
> drivers/mmc/host/sdhci-of-dwcmshc.c | 2 +-
> drivers/mmc/host/sdhci-of-sparx5.c | 2 +-
> drivers/mmc/host/sdhci-omap.c | 1 -
> drivers/mmc/host/sdhci-pxav2.c | 1 -
> drivers/mmc/host/sdhci-s3c.c | 1 -
> drivers/mmc/host/sdhci-sprd.c | 1 -
> drivers/mmc/host/sdhci-tegra.c | 1 -
> drivers/mmc/host/sh_mmcif.c | 1 -
> drivers/mmc/host/uniphier-sd.c | 1 -
> drivers/mmc/host/wmt-sdmmc.c | 1 -
> 29 files changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index dd18440a90c5..2fdf352b3d86 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -18,7 +18,6 @@
> #include <linux/ioport.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_gpio.h>
> #include <linux/platform_device.h>
> #include <linux/scatterlist.h>
> diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c
> index 12dca91a8ef6..02429f7afb42 100644
> --- a/drivers/mmc/host/cavium-octeon.c
> +++ b/drivers/mmc/host/cavium-octeon.c
> @@ -13,7 +13,9 @@
> #include <linux/mmc/mmc.h>
> #include <linux/mmc/slot-gpio.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> #include <asm/octeon/octeon.h>
> #include "cavium.h"
>
> diff --git a/drivers/mmc/host/cavium-thunderx.c b/drivers/mmc/host/cavium-thunderx.c
> index 202b1d6da678..2e2ff984f0b3 100644
> --- a/drivers/mmc/host/cavium-thunderx.c
> +++ b/drivers/mmc/host/cavium-thunderx.c
> @@ -14,6 +14,7 @@
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> #include <linux/pci.h>
> #include "cavium.h"
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index 7138dfa065bf..17a137f85cbe 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -21,7 +21,6 @@
> #include <linux/dma-mapping.h>
> #include <linux/mmc/mmc.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/mmc/slot-gpio.h>
> #include <linux/interrupt.h>
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index ee9a25b900ae..0669993108ec 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -11,7 +11,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iopoll.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/ioport.h>
> #include <linux/dma-mapping.h>
> diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> index 02403ff99e0d..6c68c642ef61 100644
> --- a/drivers/mmc/host/mtk-sd.c
> +++ b/drivers/mmc/host/mtk-sd.c
> @@ -12,9 +12,7 @@
> #include <linux/iopoll.h>
> #include <linux/ioport.h>
> #include <linux/irq.h>
> -#include <linux/of_address.h>
> -#include <linux/of_device.h>
> -#include <linux/of_irq.h>
> +#include <linux/of.h>
> #include <linux/of_gpio.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
> index 668f865f3efb..226a10202d25 100644
> --- a/drivers/mmc/host/mxcmmc.c
> +++ b/drivers/mmc/host/mxcmmc.c
> @@ -31,7 +31,6 @@
> #include <linux/dmaengine.h>
> #include <linux/types.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_dma.h>
> #include <linux/mmc/slot-gpio.h>
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 8c3655d3be96..951c6c48b4f7 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -11,7 +11,6 @@
> #include <linux/init.h>
> #include <linux/ioport.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
> index 1bf22b08b373..62d2993573d0 100644
> --- a/drivers/mmc/host/owl-mmc.c
> +++ b/drivers/mmc/host/owl-mmc.c
> @@ -16,8 +16,9 @@
> #include <linux/interrupt.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/slot-gpio.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> -#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> #include <linux/reset.h>
> #include <linux/spinlock.h>
>
> diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
> index 2a988f942b6c..d274e4433fc1 100644
> --- a/drivers/mmc/host/pxamci.c
> +++ b/drivers/mmc/host/pxamci.c
> @@ -30,7 +30,6 @@
> #include <linux/gpio/consumer.h>
> #include <linux/gfp.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/soc/pxa/cpu.h>
>
> #include <linux/sizes.h>
> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> index 9ab813903b2c..4cc5bcb3213a 100644
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -15,7 +15,8 @@
> #include <linux/mmc/host.h>
> #include <linux/mod_devicetable.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/pagemap.h>
> #include <linux/scatterlist.h>
> #include <linux/sys_soc.h>
> diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> index b559ad38b667..452982e670d2 100644
> --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> @@ -15,7 +15,8 @@
> #include <linux/mmc/host.h>
> #include <linux/mod_devicetable.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/pagemap.h>
> #include <linux/scatterlist.h>
> #include <linux/sys_soc.h>
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index 6a93a54fe067..ef1fb383e1e7 100644
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -11,7 +11,6 @@
> #include <linux/clk.h>
> #include <linux/regulator/consumer.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/mmc/slot-gpio.h>
>
> #include "sdhci-pltfm.h"
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index d2f625054689..25d9849ef0d1 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -11,7 +11,7 @@
> #include <linux/mmc/host.h>
> #include <linux/mmc/mmc.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include <linux/reset.h>
>
> #include "sdhci-pltfm.h"
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index eebf94604a7f..e767fe058023 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -22,7 +22,7 @@
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/slot-gpio.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/pm_runtime.h>
> #include "sdhci-cqhci.h"
> diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
> index 86eb0045515e..6a93b1ee0b30 100644
> --- a/drivers/mmc/host/sdhci-iproc.c
> +++ b/drivers/mmc/host/sdhci-iproc.c
> @@ -10,7 +10,7 @@
> #include <linux/module.h>
> #include <linux/mmc/host.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include "sdhci-pltfm.h"
>
> struct sdhci_iproc_data {
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index 1c935b5bafe1..c0ce187e740a 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -6,7 +6,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> #include <linux/delay.h>
> #include <linux/mmc/mmc.h>
> #include <linux/pm_runtime.h>
> @@ -15,6 +14,7 @@
> #include <linux/iopoll.h>
> #include <linux/regulator/consumer.h>
> #include <linux/interconnect.h>
> +#include <linux/of.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/reset.h>
>
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index 294dd605fd2b..2f9de2518942 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -18,11 +18,11 @@
> #include <linux/clk-provider.h>
> #include <linux/mfd/syscon.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/phy/phy.h>
> #include <linux/regmap.h>
> #include <linux/reset.h>
> -#include <linux/of.h>
> #include <linux/firmware/xlnx-zynqmp.h>
>
> #include "cqhci.h"
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index cd0134580a90..808307a211f2 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -17,7 +17,7 @@
> #include <linux/mmc/slot-gpio.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include <linux/pm.h>
> #include <linux/pm_runtime.h>
>
> diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
> index e68cd87998c8..55e1e2d0494d 100644
> --- a/drivers/mmc/host/sdhci-of-dwcmshc.c
> +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
> @@ -14,7 +14,7 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include <linux/reset.h>
> #include <linux/sizes.h>
>
> diff --git a/drivers/mmc/host/sdhci-of-sparx5.c b/drivers/mmc/host/sdhci-of-sparx5.c
> index 28e4ee69e100..2e983cf49bc6 100644
> --- a/drivers/mmc/host/sdhci-of-sparx5.c
> +++ b/drivers/mmc/host/sdhci-of-sparx5.c
> @@ -13,9 +13,9 @@
> #include <linux/delay.h>
> #include <linux/module.h>
> #include <linux/regmap.h>
> -#include <linux/of_device.h>
> #include <linux/mfd/syscon.h>
> #include <linux/dma-mapping.h>
> +#include <linux/of.h>
>
> #include "sdhci-pltfm.h"
>
> diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
> index 8ed9256b83da..2593e3fbd0d9 100644
> --- a/drivers/mmc/host/sdhci-omap.c
> +++ b/drivers/mmc/host/sdhci-omap.c
> @@ -11,7 +11,6 @@
> #include <linux/mmc/slot-gpio.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_irq.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
> index 91aca8f8d6ef..86b60b0447b3 100644
> --- a/drivers/mmc/host/sdhci-pxav2.c
> +++ b/drivers/mmc/host/sdhci-pxav2.c
> @@ -19,7 +19,6 @@
> #include <linux/platform_data/pxa_sdhci.h>
> #include <linux/slab.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/mmc.h>
> #include <linux/pinctrl/consumer.h>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index 504015e84308..6245fb4584fe 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -20,7 +20,6 @@
> #include <linux/gpio.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_gpio.h>
> #include <linux/pm.h>
> #include <linux/pm_runtime.h>
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index 7f4ee2e12735..a21d6524d7ca 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -11,7 +11,6 @@
> #include <linux/iopoll.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_gpio.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index bff084f178c9..1e1eac953691 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -19,7 +19,6 @@
> #include <linux/mmc/mmc.h>
> #include <linux/mmc/slot-gpio.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> #include <linux/of.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index 5cf53348372a..838dab179724 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -46,7 +46,6 @@
> #include <linux/mmc/slot-gpio.h>
> #include <linux/mod_devicetable.h>
> #include <linux/mutex.h>
> -#include <linux/of_device.h>
> #include <linux/pagemap.h>
> #include <linux/platform_data/sh_mmcif.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
> index 61acd69fac0e..c1400d616fff 100644
> --- a/drivers/mmc/host/uniphier-sd.c
> +++ b/drivers/mmc/host/uniphier-sd.c
> @@ -13,7 +13,6 @@
> #include <linux/mmc/host.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
> diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
> index 68525d900046..f860f363be56 100644
> --- a/drivers/mmc/host/wmt-sdmmc.c
> +++ b/drivers/mmc/host/wmt-sdmmc.c
> @@ -21,7 +21,6 @@
> #include <linux/of.h>
> #include <linux/of_address.h>
> #include <linux/of_irq.h>
> -#include <linux/of_device.h>
>
> #include <linux/mmc/host.h>
> #include <linux/mmc/mmc.h>
> --
> 2.40.1
>
