dev_xxx is now defined to something other than debug, so its redefinition in linux/compat.h is problematic. This series mostly adds includes for dm/device_compat.h, if only linux/compat.h had previously been included. Some patches also fix remaining cases where dev_xxx had been called without a device. I have re-ordered includes to conform to [1]. CI is available at [2]. There's one failure, but it appears to be because fetching the docker file timed out. A passing run for that job is available at [3].
[1] https://www.denx.de/wiki/U-Boot/CodingStyle#Include_files [2] https://dev.azure.com/seanga2/u-boot/_build/results?buildId=47&view=results [3] https://dev.azure.com/seanga2/u-boot/_build/results?buildId=46&view=logs&j=a6c8f4b8-aab0-5875-641a-f1020f283ec1 Sean Anderson (16): clk: sifive: Include device_compat.h dm: syscon: Set LOG_CATEGORY firmware: scmi: Include device_compat.h mtd: mxs_nand: Fix not calling dev_xxx with a device net: ldpaa_eth: Include device_compat.h phy: Include device_compat.h ram: imxrt: Include device_compat.h spi: nsp_fspi: Include device_compat.h spi: fsl_qspi: Include device_compat.h tee: optee: Include device_compat.h timer: Include device_compat.h usb: xhci: Include device_compat.h usb: musb-new: Include device_compat.h usb: musb-new: mt85xx: Fix not calling dev_err with a device linux/compat.h: Remove redefinition of dev_xxx macros dm: Don't undefine dev_xxx macros drivers/clk/sifive/fu540-prci.c | 18 +++++++------- drivers/core/syscon-uclass.c | 2 ++ drivers/firmware/scmi/mailbox_agent.c | 1 + drivers/firmware/scmi/scmi_agent-uclass.c | 1 + drivers/firmware/scmi/smt.c | 1 + drivers/mtd/nand/raw/mxs_nand.c | 30 ++++++++++++----------- drivers/net/ldpaa_eth/ldpaa_eth.c | 16 ++++++------ drivers/phy/phy-uclass.c | 2 +- drivers/ram/imxrt_sdram.c | 1 + drivers/spi/fsl_qspi.c | 9 ++++--- drivers/spi/nxp_fspi.c | 7 +++--- drivers/tee/optee/core.c | 1 + drivers/timer/timer-uclass.c | 5 ++-- drivers/usb/host/xhci-mtk.c | 5 ++-- drivers/usb/host/xhci.c | 7 +++--- drivers/usb/musb-new/mt85xx.c | 7 +++--- drivers/usb/musb-new/musb_core.c | 2 ++ drivers/usb/musb-new/musb_dsps.c | 2 ++ drivers/usb/musb-new/musb_gadget.c | 2 ++ drivers/usb/musb-new/musb_gadget_ep0.c | 4 ++- drivers/usb/musb-new/musb_host.c | 2 ++ include/dm/device_compat.h | 20 --------------- include/linux/compat.h | 28 --------------------- 23 files changed, 75 insertions(+), 98 deletions(-) -- 2.28.0
