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

mtd: 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 was 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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230714174751.4060439-1-robh@kernel.org

authored by

Rob Herring and committed by
Miquel Raynal
c2fc6b69 de2a5d52

+29 -36
+1 -1
drivers/mtd/devices/mchp23k256.c
··· 15 15 #include <linux/sizes.h> 16 16 #include <linux/spi/flash.h> 17 17 #include <linux/spi/spi.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 20 20 #define MAX_CMD_SIZE 4 21 21
+1 -1
drivers/mtd/devices/mchp48l640.c
··· 22 22 #include <linux/sizes.h> 23 23 #include <linux/spi/flash.h> 24 24 #include <linux/spi/spi.h> 25 - #include <linux/of_device.h> 25 + #include <linux/of.h> 26 26 27 27 struct mchp48_caps { 28 28 unsigned int size;
-1
drivers/mtd/devices/mtd_dataflash.c
··· 13 13 #include <linux/err.h> 14 14 #include <linux/math64.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 18 17 #include <linux/spi/spi.h> 19 18 #include <linux/spi/flash.h>
-1
drivers/mtd/maps/physmap-bt1-rom.c
··· 14 14 #include <linux/mtd/xip.h> 15 15 #include <linux/mux/consumer.h> 16 16 #include <linux/of.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/string.h> 20 19 #include <linux/types.h>
+1 -1
drivers/mtd/maps/physmap-gemini.c
··· 8 8 */ 9 9 #include <linux/export.h> 10 10 #include <linux/of.h> 11 - #include <linux/of_device.h> 12 11 #include <linux/mtd/map.h> 13 12 #include <linux/mtd/xip.h> 14 13 #include <linux/mfd/syscon.h> 14 + #include <linux/platform_device.h> 15 15 #include <linux/regmap.h> 16 16 #include <linux/bitops.h> 17 17 #include <linux/pinctrl/consumer.h>
+1 -1
drivers/mtd/maps/physmap-ixp4xx.c
··· 11 11 */ 12 12 #include <linux/export.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 14 + #include <linux/platform_device.h> 15 15 #include <linux/mtd/map.h> 16 16 #include <linux/mtd/xip.h> 17 17 #include "physmap-ixp4xx.h"
+1
drivers/mtd/maps/physmap-ixp4xx.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #include <linux/of.h> 3 + #include <linux/platform_device.h> 3 4 #include <linux/mtd/map.h> 4 5 5 6 #ifdef CONFIG_MTD_PHYSMAP_IXP4XX
+1 -1
drivers/mtd/maps/physmap-versatile.c
··· 9 9 #include <linux/io.h> 10 10 #include <linux/of.h> 11 11 #include <linux/of_address.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/mtd/map.h> 14 13 #include <linux/mfd/syscon.h> 14 + #include <linux/platform_device.h> 15 15 #include <linux/regmap.h> 16 16 #include <linux/bitops.h> 17 17 #include "physmap-versatile.h"
+1 -1
drivers/mtd/maps/sun_uflash.c
··· 14 14 #include <linux/errno.h> 15 15 #include <linux/ioport.h> 16 16 #include <linux/of.h> 17 - #include <linux/of_device.h> 17 + #include <linux/platform_device.h> 18 18 #include <linux/slab.h> 19 19 #include <asm/prom.h> 20 20 #include <linux/uaccess.h>
+1 -1
drivers/mtd/nand/ecc-mxic.c
··· 18 18 #include <linux/mtd/nand.h> 19 19 #include <linux/mtd/nand-ecc-mxic.h> 20 20 #include <linux/mutex.h> 21 - #include <linux/of_device.h> 21 + #include <linux/of.h> 22 22 #include <linux/of_platform.h> 23 23 #include <linux/platform_device.h> 24 24 #include <linux/slab.h>
+1 -1
drivers/mtd/nand/ecc.c
··· 95 95 96 96 #include <linux/module.h> 97 97 #include <linux/mtd/nand.h> 98 + #include <linux/platform_device.h> 98 99 #include <linux/slab.h> 99 100 #include <linux/of.h> 100 - #include <linux/of_device.h> 101 101 #include <linux/of_platform.h> 102 102 103 103 static LIST_HEAD(on_host_hw_engines);
+1 -1
drivers/mtd/nand/onenand/onenand_omap2.c
··· 13 13 #include <linux/mtd/mtd.h> 14 14 #include <linux/mtd/onenand.h> 15 15 #include <linux/mtd/partitions.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/omap-gpmc.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/interrupt.h>
+1 -1
drivers/mtd/nand/raw/ams-delta.c
··· 22 22 #include <linux/mtd/nand-gpio.h> 23 23 #include <linux/mtd/rawnand.h> 24 24 #include <linux/mtd/partitions.h> 25 - #include <linux/of_device.h> 25 + #include <linux/of.h> 26 26 #include <linux/platform_device.h> 27 27 #include <linux/sizes.h> 28 28
-1
drivers/mtd/nand/raw/davinci_nand.c
··· 18 18 #include <linux/mtd/rawnand.h> 19 19 #include <linux/mtd/partitions.h> 20 20 #include <linux/slab.h> 21 - #include <linux/of_device.h> 22 21 #include <linux/of.h> 23 22 24 23 #include <linux/platform_data/mtd-davinci.h>
-1
drivers/mtd/nand/raw/denali_dt.c
··· 13 13 #include <linux/kernel.h> 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/reset.h> 19 18
+1
drivers/mtd/nand/raw/fsl_ifc_nand.c
··· 8 8 */ 9 9 10 10 #include <linux/module.h> 11 + #include <linux/platform_device.h> 11 12 #include <linux/types.h> 12 13 #include <linux/kernel.h> 13 14 #include <linux/of_address.h>
+2 -1
drivers/mtd/nand/raw/fsl_upm.c
··· 13 13 #include <linux/mtd/rawnand.h> 14 14 #include <linux/mtd/partitions.h> 15 15 #include <linux/mtd/mtd.h> 16 - #include <linux/of_platform.h> 16 + #include <linux/of.h> 17 + #include <linux/platform_device.h> 17 18 #include <linux/io.h> 18 19 #include <linux/slab.h> 19 20 #include <asm/fsl_lbc.h>
+1 -1
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/mtd/partitions.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 16 + #include <linux/platform_device.h> 17 17 #include <linux/pm_runtime.h> 18 18 #include <linux/dma/mxs-dma.h> 19 19 #include "gpmi-nand.h"
+1
drivers/mtd/nand/raw/ingenic/ingenic_ecc.c
··· 9 9 #include <linux/clk.h> 10 10 #include <linux/init.h> 11 11 #include <linux/module.h> 12 + #include <linux/of.h> 12 13 #include <linux/of_platform.h> 13 14 #include <linux/platform_device.h> 14 15
-1
drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/of.h> 15 15 #include <linux/of_address.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/gpio/consumer.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/slab.h>
+2 -1
drivers/mtd/nand/raw/marvell_nand.c
··· 77 77 #include <linux/module.h> 78 78 #include <linux/clk.h> 79 79 #include <linux/mtd/rawnand.h> 80 - #include <linux/of_platform.h> 80 + #include <linux/of.h> 81 81 #include <linux/iopoll.h> 82 82 #include <linux/interrupt.h> 83 + #include <linux/platform_device.h> 83 84 #include <linux/slab.h> 84 85 #include <linux/mfd/syscon.h> 85 86 #include <linux/regmap.h>
-1
drivers/mtd/nand/raw/meson_nand.c
··· 19 19 #include <linux/module.h> 20 20 #include <linux/iopoll.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/sched/task_stack.h> 24 23 25 24 #define NFC_REG_CMD 0x00
+2 -2
drivers/mtd/nand/raw/mpc5121_nfc.c
··· 21 21 #include <linux/mtd/mtd.h> 22 22 #include <linux/mtd/rawnand.h> 23 23 #include <linux/mtd/partitions.h> 24 + #include <linux/of.h> 24 25 #include <linux/of_address.h> 25 - #include <linux/of_device.h> 26 26 #include <linux/of_irq.h> 27 - #include <linux/of_platform.h> 27 + #include <linux/platform_device.h> 28 28 29 29 #include <asm/mpc5121.h> 30 30
-1
drivers/mtd/nand/raw/mtk_nand.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/iopoll.h> 18 18 #include <linux/of.h> 19 - #include <linux/of_device.h> 20 19 #include <linux/mtd/nand-ecc-mtk.h> 21 20 22 21 /* NAND controller register definition */
-1
drivers/mtd/nand/raw/mxc_nand.c
··· 20 20 #include <linux/irq.h> 21 21 #include <linux/completion.h> 22 22 #include <linux/of.h> 23 - #include <linux/of_device.h> 24 23 25 24 #define DRIVER_NAME "mxc_nand" 26 25
+2 -1
drivers/mtd/nand/raw/ndfc.c
··· 22 22 #include <linux/mtd/ndfc.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/mtd/mtd.h> 25 + #include <linux/of.h> 25 26 #include <linux/of_address.h> 26 - #include <linux/of_platform.h> 27 + #include <linux/platform_device.h> 27 28 #include <asm/io.h> 28 29 29 30 #define NDFC_MAX_CS 4
+1 -1
drivers/mtd/nand/raw/omap2.c
··· 22 22 #include <linux/iopoll.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 25 + #include <linux/of_platform.h> 26 26 27 27 #include <linux/platform_data/elm.h> 28 28
+1 -3
drivers/mtd/nand/raw/pl35x-nand-controller.c
··· 23 23 #include <linux/mtd/mtd.h> 24 24 #include <linux/mtd/rawnand.h> 25 25 #include <linux/mtd/partitions.h> 26 - #include <linux/of_address.h> 27 - #include <linux/of_device.h> 28 - #include <linux/of_platform.h> 26 + #include <linux/of.h> 29 27 #include <linux/platform_device.h> 30 28 #include <linux/slab.h> 31 29 #include <linux/clk.h>
+1 -1
drivers/mtd/nand/raw/qcom_nandc.c
··· 3 3 * Copyright (c) 2016, The Linux Foundation. All rights reserved. 4 4 */ 5 5 #include <linux/clk.h> 6 + #include <linux/platform_device.h> 6 7 #include <linux/slab.h> 7 8 #include <linux/bitops.h> 8 9 #include <linux/dma/qcom_adm.h> ··· 13 12 #include <linux/mtd/rawnand.h> 14 13 #include <linux/mtd/partitions.h> 15 14 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 15 #include <linux/delay.h> 18 16 #include <linux/dma/qcom_bam_dma.h> 19 17
-1
drivers/mtd/nand/raw/rockchip-nand-controller.c
··· 15 15 #include <linux/mtd/mtd.h> 16 16 #include <linux/mtd/rawnand.h> 17 17 #include <linux/of.h> 18 - #include <linux/of_device.h> 19 18 #include <linux/platform_device.h> 20 19 #include <linux/slab.h> 21 20
-1
drivers/mtd/nand/raw/s3c2410.c
··· 26 26 #include <linux/clk.h> 27 27 #include <linux/cpufreq.h> 28 28 #include <linux/of.h> 29 - #include <linux/of_device.h> 30 29 31 30 #include <linux/mtd/mtd.h> 32 31 #include <linux/mtd/rawnand.h>
-1
drivers/mtd/nand/raw/sh_flctl.c
··· 17 17 #include <linux/interrupt.h> 18 18 #include <linux/io.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/platform_device.h> 22 21 #include <linux/pm_runtime.h> 23 22 #include <linux/sh_dma.h>
+2 -1
drivers/mtd/nand/raw/socrates_nand.c
··· 8 8 #include <linux/mtd/mtd.h> 9 9 #include <linux/mtd/rawnand.h> 10 10 #include <linux/mtd/partitions.h> 11 + #include <linux/of.h> 11 12 #include <linux/of_address.h> 12 - #include <linux/of_platform.h> 13 + #include <linux/platform_device.h> 13 14 #include <linux/io.h> 14 15 15 16 #define FPGA_NAND_CMD_MASK (0x7 << 28)
-1
drivers/mtd/nand/raw/sunxi_nand.c
··· 19 19 #include <linux/moduleparam.h> 20 20 #include <linux/platform_device.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/mtd/mtd.h> 24 23 #include <linux/mtd/rawnand.h> 25 24 #include <linux/mtd/partitions.h>
+2 -1
drivers/mtd/nand/raw/xway_nand.c
··· 7 7 8 8 #include <linux/mtd/rawnand.h> 9 9 #include <linux/of_gpio.h> 10 - #include <linux/of_platform.h> 10 + #include <linux/of.h> 11 + #include <linux/platform_device.h> 11 12 12 13 #include <lantiq_soc.h> 13 14
-1
drivers/mtd/spi-nor/controllers/nxp-spifi.c
··· 17 17 #include <linux/mtd/partitions.h> 18 18 #include <linux/mtd/spi-nor.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/platform_device.h> 22 21 #include <linux/spi/spi.h> 23 22