usb: Explicitly include correct DT includes
Subsystems (29)
PATCH 1/1 usb: 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.
--- drivers/usb/cdns3/cdns3-gadget.c | 1 + drivers/usb/cdns3/cdns3-plat.c | 1 + drivers/usb/cdns3/cdns3-ti.c | 1 + drivers/usb/cdns3/core.c | 1 + drivers/usb/chipidea/ci_hdrc_imx.c | 1 + drivers/usb/chipidea/ci_hdrc_tegra.c | 3 ++- drivers/usb/chipidea/usbmisc_imx.c | 3 ++- drivers/usb/common/common.c | 1 + drivers/usb/core/message.c | 1 + drivers/usb/core/of.c | 1 - drivers/usb/core/usb.c | 1 + drivers/usb/dwc2/gadget.c | 1 - drivers/usb/dwc2/platform.c | 2 +- drivers/usb/dwc3/dwc3-imx8mp.c | 1 + drivers/usb/dwc3/dwc3-keystone.c | 1 + drivers/usb/gadget/udc/fsl_udc_core.c | 1 - drivers/usb/gadget/udc/gr_udc.c | 5 ++--- drivers/usb/gadget/udc/max3420_udc.c | 4 +--- drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 +- drivers/usb/gadget/udc/renesas_usbf.c | 5 ++--- drivers/usb/gadget/udc/tegra-xudc.c | 1 - drivers/usb/gadget/udc/udc-xilinx.c | 6 ++---- drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-orion.c | 2 -- drivers/usb/host/fhci-hcd.c | 3 ++- drivers/usb/host/fsl-mph-dr-of.c | 4 +++- drivers/usb/host/ohci-at91.c | 2 +- drivers/usb/host/ohci-da8xx.c | 1 + drivers/usb/host/ohci-ppc-of.c | 3 ++- drivers/usb/host/xhci-plat.c | 1 - drivers/usb/host/xhci-rcar.c | 1 - drivers/usb/host/xhci-tegra.c | 2 +- drivers/usb/misc/usb251xb.c | 2 +- drivers/usb/mtu3/mtu3.h | 1 + drivers/usb/mtu3/mtu3_host.c | 1 + drivers/usb/musb/jz4740.c | 2 +- drivers/usb/musb/mediatek.c | 1 + drivers/usb/musb/mpfs.c | 1 + drivers/usb/musb/musb_dsps.c | 2 -- drivers/usb/musb/sunxi.c | 1 - drivers/usb/phy/phy-mxs-usb.c | 2 +- drivers/usb/phy/phy-tegra-usb.c | 2 +- drivers/usb/renesas_usbhs/common.c | 2 +- drivers/usb/renesas_usbhs/rza.c | 2 +- drivers/usb/renesas_usbhs/rza2.c | 1 - drivers/usb/typec/tcpm/fusb302.c | 2 +- drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 2 +- drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 2 -- drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 1 - drivers/usb/typec/ucsi/ucsi_glink.c | 1 - 51 files changed, 47 insertions(+), 48 deletions(-)
drivers/usb/cdns3/cdns3-gadget.c +1 -0
@@ -61,6 +61,7 @@#include <linux/module.h> #include <linux/dmapool.h> #include <linux/iopoll.h> +#include <linux/property.h> #include "core.h" #include "gadget-export.h"
drivers/usb/cdns3/cdns3-plat.c +1 -0
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/irq.h> #include <linux/kernel.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
drivers/usb/cdns3/cdns3-ti.c +1 -0
@@ -15,6 +15,7 @@#include <linux/io.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> +#include <linux/property.h> /* USB Wrapper register offsets */ #define USBSS_PID 0x0
drivers/usb/cdns3/core.c +1 -0
@@ -14,6 +14,7 @@#include <linux/dma-mapping.h> #include <linux/module.h> #include <linux/kernel.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/io.h>
drivers/usb/chipidea/ci_hdrc_imx.c +1 -0
@@ -6,6 +6,7 @@*/ #include <linux/module.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
drivers/usb/chipidea/ci_hdrc_tegra.c +2 -1
@@ -6,7 +6,8 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h>
drivers/usb/chipidea/usbmisc_imx.c +2 -1
@@ -4,10 +4,11 @@*/ #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/err.h> #include <linux/io.h> #include <linux/delay.h> +#include <linux/platform_device.h> #include <linux/usb/otg.h> #include "ci_hdrc_imx.h"
drivers/usb/common/common.c +1 -0
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/platform_device.h> #include <linux/usb/ch9.h> #include <linux/usb/of.h> #include <linux/usb/otg.h>
drivers/usb/core/message.c +1 -0
@@ -9,6 +9,7 @@#include <linux/pci.h> /* for scatterlist macros */ #include <linux/usb.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/slab.h> #include <linux/mm.h> #include <linux/timer.h>
drivers/usb/core/of.c +0 -1
@@ -8,7 +8,6 @@*/ #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/usb/of.h> /**
drivers/usb/core/usb.c +1 -0
@@ -25,6 +25,7 @@#include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/string.h> #include <linux/bitops.h> #include <linux/slab.h>
drivers/usb/dwc2/gadget.c +0 -1
@@ -22,7 +22,6 @@#include <linux/delay.h> #include <linux/io.h> #include <linux/slab.h> -#include <linux/of_platform.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h>
drivers/usb/dwc2/platform.c +1 -1
@@ -11,7 +11,7 @@#include <linux/clk.h> #include <linux/device.h> #include <linux/dma-mapping.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/phy/phy.h>
drivers/usb/dwc3/dwc3-imx8mp.c +1 -0
@@ -10,6 +10,7 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
drivers/usb/dwc3/dwc3-keystone.c +1 -0
@@ -13,6 +13,7 @@#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/io.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/phy/phy.h> #include <linux/pm_runtime.h>
drivers/usb/gadget/udc/fsl_udc_core.c +0 -1
@@ -36,7 +36,6 @@#include <linux/platform_device.h> #include <linux/fsl_devices.h> #include <linux/dmapool.h> -#include <linux/of_device.h> #include <asm/byteorder.h> #include <asm/io.h>
drivers/usb/gadget/udc/gr_udc.c +2 -3
@@ -23,6 +23,7 @@#include <linux/kernel.h> #include <linux/module.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/errno.h>
@@ -36,9 +37,7 @@#include <linux/dmapool.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <linux/of_platform.h> -#include <linux/of_irq.h> -#include <linux/of_address.h> +#include <linux/of.h> #include <asm/byteorder.h>
drivers/usb/gadget/udc/max3420_udc.c +1 -3
@@ -19,9 +19,7 @@#include <linux/io.h> #include <linux/module.h> #include <linux/bitfield.h> -#include <linux/of_address.h> -#include <linux/of_device.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/of_irq.h> #include <linux/prefetch.h> #include <linux/usb/ch9.h>
drivers/usb/gadget/udc/pxa27x_udc.c +1 -1
@@ -23,7 +23,7 @@#include <linux/prefetch.h> #include <linux/byteorder/generic.h> #include <linux/platform_data/pxa2xx_udc.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_gpio.h> #include <linux/usb.h>
drivers/usb/gadget/udc/renesas_usb3.c +1 -1
@@ -14,7 +14,7 @@#include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
drivers/usb/gadget/udc/renesas_usbf.c +2 -3
@@ -12,10 +12,9 @@#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/kfifo.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/types.h> #include <linux/usb/composite.h>
drivers/usb/gadget/udc/tegra-xudc.c +0 -1
@@ -16,7 +16,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/phy/phy.h> #include <linux/phy/tegra/xusb.h> #include <linux/pm_domain.h>
drivers/usb/gadget/udc/udc-xilinx.c +2 -4
@@ -18,10 +18,8 @@#include <linux/interrupt.h> #include <linux/io.h> #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/of.h> +#include <linux/platform_device.h> #include <linux/prefetch.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h>
drivers/usb/host/ehci-fsl.c +1 -1
@@ -22,7 +22,7 @@#include <linux/usb/otg.h> #include <linux/platform_device.h> #include <linux/fsl_devices.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/io.h> #include "ehci.h"
drivers/usb/host/ehci-orion.c +0 -2
@@ -13,8 +13,6 @@#include <linux/platform_data/usb-ehci-orion.h> #include <linux/of.h> #include <linux/phy/phy.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> #include <linux/usb.h> #include <linux/usb/hcd.h> #include <linux/io.h>
drivers/usb/host/fhci-hcd.c +2 -1
@@ -22,9 +22,10 @@#include <linux/io.h> #include <linux/usb.h> #include <linux/usb/hcd.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/gpio/consumer.h> #include <soc/fsl/qe/qe.h>
drivers/usb/host/fsl-mph-dr-of.c +3 -1
@@ -10,10 +10,12 @@#include <linux/fsl_devices.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/clk.h> #include <linux/module.h> #include <linux/dma-mapping.h> +#include <linux/of.h> struct fsl_usb2_dev_data {char *dr_mode;/* controller mode */
drivers/usb/host/ohci-at91.c +1 -1
@@ -17,13 +17,13 @@#include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/gpio/consumer.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/platform_data/atmel.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mfd/syscon.h> +#include <linux/of.h> #include <linux/regmap.h> #include <linux/usb.h> #include <linux/usb/hcd.h>
drivers/usb/host/ohci-da8xx.c +1 -0
@@ -15,6 +15,7 @@#include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/phy/phy.h> #include <linux/platform_data/usb-davinci.h>
drivers/usb/host/ohci-ppc-of.c +2 -1
@@ -15,9 +15,10 @@*/ #include <linux/signal.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> static int ohci_ppc_of_start (struct usb_hcd *hcd)
drivers/usb/host/xhci-plat.c +0 -1
@@ -13,7 +13,6 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/usb/phy.h> #include <linux/slab.h>
drivers/usb/host/xhci-rcar.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/usb/phy.h> #include "xhci.h"
drivers/usb/host/xhci-tegra.c +1 -1
@@ -14,7 +14,7 @@#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_irq.h> #include <linux/phy/phy.h> #include <linux/phy/tegra/xusb.h>
drivers/usb/misc/usb251xb.c +1 -1
@@ -16,7 +16,7 @@#include <linux/i2c.h> #include <linux/module.h> #include <linux/nls.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/slab.h>
drivers/usb/mtu3/mtu3.h +1 -0
@@ -16,6 +16,7 @@#include <linux/extcon.h> #include <linux/interrupt.h> #include <linux/list.h> +#include <linux/of.h> #include <linux/phy/phy.h> #include <linux/regulator/consumer.h> #include <linux/usb.h>
drivers/usb/mtu3/mtu3_host.c +1 -0
@@ -11,6 +11,7 @@#include <linux/irq.h> #include <linux/kernel.h> #include <linux/mfd/syscon.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/regmap.h>
drivers/usb/musb/jz4740.c +1 -1
@@ -10,7 +10,7 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/usb/role.h>
drivers/usb/musb/mediatek.c +1 -0
@@ -10,6 +10,7 @@#include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/usb/role.h>
drivers/usb/musb/mpfs.c +1 -0
@@ -13,6 +13,7 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/usb/usb_phy_generic.h> #include "musb_core.h"
drivers/usb/musb/musb_dsps.c +0 -2
@@ -26,9 +26,7 @@#include <linux/sizes.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/usb/of.h> #include <linux/debugfs.h>
drivers/usb/musb/sunxi.c +0 -1
@@ -15,7 +15,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/phy/phy-sun4i-usb.h> #include <linux/platform_device.h> #include <linux/reset.h>
drivers/usb/phy/phy-mxs-usb.c +1 -1
@@ -14,7 +14,7 @@#include <linux/delay.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> #include <linux/iopoll.h>
drivers/usb/phy/phy-tegra-usb.c +1 -1
@@ -16,7 +16,7 @@#include <linux/iopoll.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/resource.h> #include <linux/slab.h>
drivers/usb/renesas_usbhs/common.c +1 -1
@@ -11,7 +11,7 @@#include <linux/gpio/consumer.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/pm_runtime.h> #include <linux/reset.h> #include <linux/slab.h>
drivers/usb/renesas_usbhs/rza.c +1 -1
@@ -8,7 +8,7 @@#include <linux/delay.h> #include <linux/io.h> -#include <linux/of_device.h> +#include <linux/of.h> #include "common.h" #include "rza.h"
drivers/usb/renesas_usbhs/rza2.c +0 -1
@@ -8,7 +8,6 @@#include <linux/delay.h> #include <linux/io.h> -#include <linux/of_device.h> #include <linux/phy/phy.h> #include "common.h" #include "rza.h"
drivers/usb/typec/tcpm/fusb302.c +1 -1
@@ -15,7 +15,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/pinctrl/consumer.h> #include <linux/proc_fs.h> #include <linux/regulator/consumer.h>
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c +1 -1
@@ -8,7 +8,7 @@#include <linux/kernel.h> #include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_graph.h> #include <linux/platform_device.h> #include <linux/regmap.h>
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c +0 -2
@@ -8,8 +8,6 @@#include <linux/kernel.h> #include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c +0 -1
@@ -9,7 +9,6 @@#include <linux/kernel.h> #include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
drivers/usb/typec/ucsi/ucsi_glink.c +0 -1
@@ -5,7 +5,6 @@*/ #include <linux/auxiliary_bus.h> #include <linux/module.h> -#include <linux/of_device.h> #include <linux/mutex.h> #include <linux/property.h> #include <linux/soc/qcom/pdr.h>
Signature · 1 line
2.40.1
Quoted 12 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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 <[email protected]>---
[...]
Quoted 5 lines
drivers/usb/host/fsl-mph-dr-of.c +0
-0
drivers/usb/host/fsl-mph-dr-of.c line 18
Quoted 10 lines
drivers/usb/host/fsl-mph-dr-of.c +3
-1@@ -10,10 +10,12 @@#include <linux/fsl_devices.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/clk.h> #include <linux/module.h> #include <linux/dma-mapping.h> +#include <linux/of.h>
Double include of of.h here. v2 coming.
Rob
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Rob,
Quoted 11 lines · On Fri, 14 Jul 2023 11:50:23 -0600 Rob Herring <[email protected]> wrote:
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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 <[email protected]>---
[...]
Quoted 7 lines
drivers/usb/gadget/udc/renesas_usbf.c +0
-0@@ -12,10 +12,9 @@#include <linux/iopoll.h> #include <linux/kernel.h>
drivers/usb/gadget/udc/renesas_usbf.c line 20
Quoted 10 lines
drivers/usb/gadget/udc/renesas_usbf.c +2
-3#include <linux/kfifo.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/types.h> #include <linux/usb/composite.h>
Best regards,
Hervé