On Mon, Apr 20, 2020 at 06:04:29PM +0300, Hadar Gat wrote: > Both of_platform.h and of_device.h were included each other. > In of_device.h, removed unneeded #include to of_platform.h > and added include to of_platform.h in the files that needs it. > > Signed-off-by: Hadar Gat <hadar.gat@xxxxxxx> > Reported-by: kbuild test robot <lkp@xxxxxxxxx> > Acked-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> #for-iio > Acked-by: Stephen Boyd <sboyd@xxxxxxxxxx> # clk > --- > v3: add include to of_platform.h in more files. (reported due other builds) > v2: add include to of_platform.h in more files. (reported due other builds) > > arch/sparc/kernel/pci.c | 1 + > arch/sparc/kernel/pci_sabre.c | 1 + > arch/sparc/kernel/pci_schizo.c | 1 + > arch/sparc/kernel/sbus.c | 1 + > arch/sparc/mm/io-unit.c | 1 + > arch/sparc/mm/iommu.c | 1 + > drivers/base/platform.c | 1 + > drivers/bus/imx-weim.c | 1 + > drivers/bus/vexpress-config.c | 1 + For drivers/bus/vexpress-config.c: Acked-by: Liviu Dudau <liviu.dudau@xxxxxxx> Best regards, Liviu > drivers/clk/mediatek/clk-mt7622-aud.c | 1 + > drivers/dma/at_hdmac.c | 1 + > drivers/dma/stm32-dmamux.c | 1 + > drivers/dma/ti/dma-crossbar.c | 1 + > drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 1 + > drivers/gpu/drm/msm/hdmi/hdmi.c | 1 + > drivers/gpu/drm/msm/msm_drv.c | 1 + > drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1 + > drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + > drivers/iio/adc/stm32-adc-core.c | 1 + > drivers/iio/adc/stm32-dfsdm-adc.c | 1 + > drivers/iio/adc/stm32-dfsdm-core.c | 1 + > drivers/iommu/tegra-smmu.c | 1 + > drivers/media/platform/coda/coda-common.c | 1 + > drivers/memory/atmel-ebi.c | 1 + > drivers/mfd/palmas.c | 1 + > drivers/mfd/ssbi.c | 1 + > drivers/mtd/nand/raw/omap2.c | 1 + > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 1 + > drivers/net/ethernet/ti/cpsw.c | 1 + > drivers/phy/tegra/xusb.c | 1 + > drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 + > drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 + > drivers/soc/samsung/exynos-pmu.c | 1 + > drivers/soc/sunxi/sunxi_sram.c | 1 + > include/linux/of_device.h | 2 -- > lib/genalloc.c | 1 + > 36 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c > index 5ed4382..89ea658 100644 > --- a/arch/sparc/kernel/pci.c > +++ b/arch/sparc/kernel/pci.c > @@ -21,6 +21,7 @@ > #include <linux/init.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <linux/uaccess.h> > #include <asm/pgtable.h> > diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c > index 3c38ca4..16761d0 100644 > --- a/arch/sparc/kernel/pci_sabre.c > +++ b/arch/sparc/kernel/pci_sabre.c > @@ -14,6 +14,7 @@ > #include <linux/slab.h> > #include <linux/interrupt.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <asm/apb.h> > #include <asm/iommu.h> > diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c > index 421aba0..733f069 100644 > --- a/arch/sparc/kernel/pci_schizo.c > +++ b/arch/sparc/kernel/pci_schizo.c > @@ -12,6 +12,7 @@ > #include <linux/export.h> > #include <linux/interrupt.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/numa.h> > > #include <asm/iommu.h> > diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c > index 32141e1..2f4051f 100644 > --- a/arch/sparc/kernel/sbus.c > +++ b/arch/sparc/kernel/sbus.c > @@ -15,6 +15,7 @@ > #include <linux/interrupt.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/numa.h> > > #include <asm/page.h> > diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c > index 289276b..5638399 100644 > --- a/arch/sparc/mm/io-unit.c > +++ b/arch/sparc/mm/io-unit.c > @@ -15,6 +15,7 @@ > #include <linux/dma-mapping.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <asm/pgalloc.h> > #include <asm/pgtable.h> > diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c > index b00dde1..9cbb2e7 100644 > --- a/arch/sparc/mm/iommu.c > +++ b/arch/sparc/mm/iommu.c > @@ -16,6 +16,7 @@ > #include <linux/dma-mapping.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <asm/pgalloc.h> > #include <asm/pgtable.h> > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index 5255550..f549274b 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -12,6 +12,7 @@ > #include <linux/string.h> > #include <linux/platform_device.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_irq.h> > #include <linux/module.h> > #include <linux/init.h> > diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c > index 28bb65a..8c786da 100644 > --- a/drivers/bus/imx-weim.c > +++ b/drivers/bus/imx-weim.c > @@ -11,6 +11,7 @@ > #include <linux/clk.h> > #include <linux/io.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/mfd/syscon.h> > #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> > #include <linux/regmap.h> > diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c > index ff70575..12b8b0b 100644 > --- a/drivers/bus/vexpress-config.c > +++ b/drivers/bus/vexpress-config.c > @@ -8,6 +8,7 @@ > #include <linux/init.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/vexpress.h> > > > diff --git a/drivers/clk/mediatek/clk-mt7622-aud.c b/drivers/clk/mediatek/clk-mt7622-aud.c > index 2bd4295..8cbb68f 100644 > --- a/drivers/clk/mediatek/clk-mt7622-aud.c > +++ b/drivers/clk/mediatek/clk-mt7622-aud.c > @@ -9,6 +9,7 @@ > #include <linux/of.h> > #include <linux/of_address.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > > #include "clk-mtk.h" > diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c > index 73a2078..388f8e10 100644 > --- a/drivers/dma/at_hdmac.c > +++ b/drivers/dma/at_hdmac.c > @@ -20,6 +20,7 @@ > #include <linux/slab.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_dma.h> > > #include "at_hdmac_regs.h" > diff --git a/drivers/dma/stm32-dmamux.c b/drivers/dma/stm32-dmamux.c > index 12f7637..b704896 100644 > --- a/drivers/dma/stm32-dmamux.c > +++ b/drivers/dma/stm32-dmamux.c > @@ -16,6 +16,7 @@ > #include <linux/init.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_dma.h> > #include <linux/pm_runtime.h> > #include <linux/reset.h> > diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c > index 4ba8fa5..2c0fd44 100644 > --- a/drivers/dma/ti/dma-crossbar.c > +++ b/drivers/dma/ti/dma-crossbar.c > @@ -10,6 +10,7 @@ > #include <linux/io.h> > #include <linux/of_address.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_dma.h> > > #define TI_XBAR_DRA7 0 > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > index c4e71ab..f523254 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > @@ -6,6 +6,7 @@ > #include <linux/interconnect.h> > #include <linux/pm_domain.h> > #include <linux/pm_opp.h> > +#include <linux/of_platform.h> > #include <soc/qcom/cmd-db.h> > > #include "a6xx_gpu.h" > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c > index 737453b..5034d40 100644 > --- a/drivers/gpu/drm/msm/hdmi/hdmi.c > +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c > @@ -7,6 +7,7 @@ > > #include <linux/of_irq.h> > #include <linux/of_gpio.h> > +#include <linux/of_platform.h> > > #include <sound/hdmi-codec.h> > #include "hdmi.h" > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 29295de..ddc9e85 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -8,6 +8,7 @@ > #include <linux/dma-mapping.h> > #include <linux/kthread.h> > #include <linux/uaccess.h> > +#include <linux/of_platform.h> > #include <uapi/linux/sched/types.h> > > #include <drm/drm_drv.h> > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > index 6e1270e..d038bae 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > @@ -12,6 +12,7 @@ > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/phy/phy.h> > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c > index 624437b..aa35757 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c > +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c > @@ -11,6 +11,7 @@ > #include <linux/module.h> > #include <linux/of_address.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_irq.h> > #include <linux/regmap.h> > #include <linux/reset.h> > diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c > index 2df88d2..3dc3453 100644 > --- a/drivers/iio/adc/stm32-adc-core.c > +++ b/drivers/iio/adc/stm32-adc-core.c > @@ -17,6 +17,7 @@ > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > #include <linux/regulator/consumer.h> > diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c > index 76a60d9..e83848cb 100644 > --- a/drivers/iio/adc/stm32-dfsdm-adc.c > +++ b/drivers/iio/adc/stm32-dfsdm-adc.c > @@ -20,6 +20,7 @@ > #include <linux/interrupt.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/slab.h> > diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c > index 26e2011..f6a53ab 100644 > --- a/drivers/iio/adc/stm32-dfsdm-core.c > +++ b/drivers/iio/adc/stm32-dfsdm-core.c > @@ -12,6 +12,7 @@ > #include <linux/interrupt.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/pinctrl/consumer.h> > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c > index 63a147b..3797caa 100644 > --- a/drivers/iommu/tegra-smmu.c > +++ b/drivers/iommu/tegra-smmu.c > @@ -10,6 +10,7 @@ > #include <linux/kernel.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <linux/dma-mapping.h> > diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c > index d0d093d..0874824 100644 > --- a/drivers/media/platform/coda/coda-common.c > +++ b/drivers/media/platform/coda/coda-common.c > @@ -20,6 +20,7 @@ > #include <linux/kfifo.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/slab.h> > diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c > index 14386d0..272b1a8 100644 > --- a/drivers/memory/atmel-ebi.c > +++ b/drivers/memory/atmel-ebi.c > @@ -13,6 +13,7 @@ > #include <linux/mfd/syscon/atmel-smc.h> > #include <linux/init.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/regmap.h> > #include <soc/at91/atmel-sfr.h> > > diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c > index f5b3fa9..cca44bc 100644 > --- a/drivers/mfd/palmas.c > +++ b/drivers/mfd/palmas.c > @@ -19,6 +19,7 @@ > #include <linux/mfd/core.h> > #include <linux/mfd/palmas.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > static const struct regmap_config palmas_regmap_config[PALMAS_NUM_CLIENTS] = { > { > diff --git a/drivers/mfd/ssbi.c b/drivers/mfd/ssbi.c > index 94f60df..72cd45a 100644 > --- a/drivers/mfd/ssbi.c > +++ b/drivers/mfd/ssbi.c > @@ -20,6 +20,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > /* SSBI 2.0 controller registers */ > #define SSBI2_CMD 0x0008 > diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c > index ad77c11..d851ec7 100644 > --- a/drivers/mtd/nand/raw/omap2.c > +++ b/drivers/mtd/nand/raw/omap2.c > @@ -22,6 +22,7 @@ > #include <linux/slab.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <linux/mtd/nand_bch.h> > #include <linux/platform_data/elm.h> > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > index 58e0511..d704d57 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > @@ -12,6 +12,7 @@ > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_mdio.h> > #include <linux/of_net.h> > #include <linux/phy.h> > diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c > index c2c5bf8..6932945 100644 > --- a/drivers/net/ethernet/ti/cpsw.c > +++ b/drivers/net/ethernet/ti/cpsw.c > @@ -28,6 +28,7 @@ > #include <linux/of_mdio.h> > #include <linux/of_net.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/if_vlan.h> > #include <linux/kmemleak.h> > #include <linux/sys_soc.h> > diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c > index de4a46f..0eac1b8 100644 > --- a/drivers/phy/tegra/xusb.c > +++ b/drivers/phy/tegra/xusb.c > @@ -9,6 +9,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/phy/phy.h> > #include <linux/phy/tegra/xusb.h> > #include <linux/platform_device.h> > diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c > index c00d002..d1c171e 100644 > --- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c > +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c > @@ -16,6 +16,7 @@ > #include <linux/io.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/pinctrl/machine.h> > #include <linux/pinctrl/pinconf.h> > #include <linux/pinctrl/pinctrl.h> > diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c > index ca7bbe4..44974ac 100644 > --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c > +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c > @@ -19,6 +19,7 @@ > #include <linux/interrupt.h> > #include <linux/slab.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/of_address.h> > #include <linux/bitops.h> > #include <linux/pinctrl/machine.h> > diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c > index 17304fa..25129b0 100644 > --- a/drivers/soc/samsung/exynos-pmu.c > +++ b/drivers/soc/samsung/exynos-pmu.c > @@ -8,6 +8,7 @@ > #include <linux/of.h> > #include <linux/of_address.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/mfd/syscon.h> > #include <linux/platform_device.h> > #include <linux/delay.h> > diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c > index 1b0d50f..423cec3 100644 > --- a/drivers/soc/sunxi/sunxi_sram.c > +++ b/drivers/soc/sunxi/sunxi_sram.c > @@ -16,6 +16,7 @@ > #include <linux/of.h> > #include <linux/of_address.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > > diff --git a/include/linux/of_device.h b/include/linux/of_device.h > index 8d31e39..752999b 100644 > --- a/include/linux/of_device.h > +++ b/include/linux/of_device.h > @@ -4,8 +4,6 @@ > > #include <linux/cpu.h> > #include <linux/platform_device.h> > -#include <linux/of_platform.h> /* temporary until merge */ > - > #include <linux/of.h> > #include <linux/mod_devicetable.h> > > diff --git a/lib/genalloc.c b/lib/genalloc.c > index 7f1244b..08e21eeb 100644 > --- a/lib/genalloc.c > +++ b/lib/genalloc.c > @@ -33,6 +33,7 @@ > #include <linux/interrupt.h> > #include <linux/genalloc.h> > #include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/vmalloc.h> > > static inline size_t chunk_size(const struct gen_pool_chunk *chunk) > -- > 2.7.4 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel