[PATCH 00/16] dm: Remove redefinitions of dev_xxx macros

classic Classic list List threaded Threaded
47 messages Options
123
Reply | Threaded
Open this post in threaded view
|

[PATCH 00/16] dm: Remove redefinitions of dev_xxx macros

Sean Anderson
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

Reply | Threaded
Open this post in threaded view
|

[PATCH 01/16] clk: sifive: Include device_compat.h

Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/clk/sifive/fu540-prci.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index c5148e9a37..1b4d81d4f0 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -29,23 +29,23 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
-#include <asm/arch/reset.h>
 #include <clk-uclass.h>
 #include <clk.h>
 #include <div64.h>
 #include <dm.h>
-#include <errno.h>
-#include <reset-uclass.h>
 #include <dm/device.h>
+#include <dm/device_compat.h>
 #include <dm/uclass.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-
-#include <linux/math64.h>
-#include <linux/clk/analogbits-wrpll-cln28hpc.h>
 #include <dt-bindings/clock/sifive-fu540-prci.h>
 #include <dt-bindings/reset/sifive-fu540-prci.h>
+#include <errno.h>
+#include <reset-uclass.h>
+#include <asm/io.h>
+#include <asm/arch/reset.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/math64.h>
+#include <linux/clk/analogbits-wrpll-cln28hpc.h>
 
 /*
  * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects:
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 02/16] dm: syscon: Set LOG_CATEGORY

Sean Anderson
In reply to this post by Sean Anderson
We call log_debug, but do not have a category set.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/core/syscon-uclass.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 5be1d527a0..509b09845a 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -4,6 +4,8 @@
  * Written by Simon Glass <[hidden email]>
  */
 
+#define LOG_CATEGORY UCLASS_SYSCON
+
 #include <common.h>
 #include <log.h>
 #include <syscon.h>
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 03/16] firmware: scmi: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
This header is necessary for the dev_xxx macros.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/firmware/scmi/mailbox_agent.c     | 1 +
 drivers/firmware/scmi/scmi_agent-uclass.c | 1 +
 drivers/firmware/scmi/smt.c               | 1 +
 3 files changed, 3 insertions(+)

diff --git a/drivers/firmware/scmi/mailbox_agent.c b/drivers/firmware/scmi/mailbox_agent.c
index 7d9fb3622e..a85cff1097 100644
--- a/drivers/firmware/scmi/mailbox_agent.c
+++ b/drivers/firmware/scmi/mailbox_agent.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <errno.h>
 #include <mailbox.h>
 #include <scmi_agent.h>
diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c
index 77160b1999..7dc533149b 100644
--- a/drivers/firmware/scmi/scmi_agent-uclass.c
+++ b/drivers/firmware/scmi/scmi_agent-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <errno.h>
 #include <scmi_agent-uclass.h>
 #include <scmi_protocols.h>
diff --git a/drivers/firmware/scmi/smt.c b/drivers/firmware/scmi/smt.c
index ce8fe49939..d25478796a 100644
--- a/drivers/firmware/scmi/smt.c
+++ b/drivers/firmware/scmi/smt.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <errno.h>
 #include <scmi_agent.h>
 #include <asm/cache.h>
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 04/16] mtd: mxs_nand: Fix not calling dev_xxx with a device

Sean Anderson
In reply to this post by Sean Anderson
This includes device_compat.h, and fixes several calls to dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/mtd/nand/raw/mxs_nand.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index a7852a841c..e6bbfac4d6 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,19 +16,20 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <dm/device_compat.h>
+#include <malloc.h>
+#include <mxs_nand.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/io.h>
+#include <asm/mach-imx/regs-bch.h>
+#include <asm/mach-imx/regs-gpmi.h>
+#include <linux/errno.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/types.h>
-#include <malloc.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/mach-imx/regs-bch.h>
-#include <asm/mach-imx/regs-gpmi.h>
-#include <asm/arch/sys_proto.h>
-#include <mxs_nand.h>
 
 #define MXS_NAND_DMA_DESCRIPTOR_COUNT 4
 
@@ -115,13 +116,14 @@ static uint32_t mxs_nand_aux_status_offset(void)
  return (MXS_NAND_METADATA_SIZE + 0x3) & ~0x3;
 }
 
-static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct mtd_info *mtd,
- unsigned int *chunk_num)
+static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo,
+      struct mtd_info *mtd,
+      unsigned int *chunk_num)
 {
  unsigned int i, j;
 
  if (geo->ecc_chunk0_size != geo->ecc_chunkn_size) {
- dev_err(this->dev, "The size of chunk0 must equal to chunkn\n");
+ dev_err(mtd->dev, "The size of chunk0 must equal to chunkn\n");
  return false;
  }
 
@@ -135,7 +137,7 @@ static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct m
 
  if (j < geo->ecc_chunkn_size * 8) {
  *chunk_num = i + 1;
- dev_dbg(this->dev, "Set ecc to %d and bbm in chunk %d\n",
+ dev_dbg(mtd->dev, "Set ecc to %d and bbm in chunk %d\n",
  geo->ecc_strength, *chunk_num);
  return true;
  }
@@ -1118,7 +1120,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo)
 
  if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) &&
      mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) {
- dev_warn(this->dev, "use legacy bch geometry\n");
+ dev_warn(mtd->dev, "use legacy bch geometry\n");
  return mxs_nand_legacy_calc_ecc_layout(geo, mtd);
  }
 
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 05/16] net: ldpaa_eth: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/net/ldpaa_eth/ldpaa_eth.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 67da549fdb..42eaf49d71 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -6,20 +6,20 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <dm/device_compat.h>
+#include <fsl-mc/fsl_dpmac.h>
+#include <fsl-mc/ldpaa_wriop.h>
+#include <hwconfig.h>
 #include <log.h>
+#include <malloc.h>
+#include <miiphy.h>
+#include <net.h>
+#include <phy.h>
 #include <asm/io.h>
 #include <asm/types.h>
-#include <malloc.h>
-#include <net.h>
-#include <hwconfig.h>
-#include <phy.h>
-#include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
-#include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
-
-#include <fsl-mc/ldpaa_wriop.h>
 #include "ldpaa_eth.h"
 
 #ifdef CONFIG_PHYLIB
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 06/16] phy: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/phy/phy-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index 8f456f33d2..df06cc1196 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -6,9 +6,9 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <generic-phy.h>
-#include <log.h>
 
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
 {
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 07/16] ram: imxrt: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/ram/imxrt_sdram.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 765a2141d1..b6ee02d227 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 08/16] spi: nsp_fspi: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/spi/nxp_fspi.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index c507437f2e..5a639cce30 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -34,12 +34,13 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
-#include <dm.h>
-#include <clk.h>
+#include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 09/16] spi: fsl_qspi: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/spi/fsl_qspi.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index eec968e5ec..128f95877f 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -24,19 +24,20 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <log.h>
-#include <asm/io.h>
+#include <spi.h>
+#include <spi-mem.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
-#include <dm.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
 #include <linux/err.h>
-#include <spi.h>
-#include <spi-mem.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 10/16] tee: optee: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/tee/optee/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 5260dab3ac..66ade37cd4 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <log.h>
 #include <malloc.h>
 #include <tee.h>
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 11/16] timer: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
Necessary for dev_xxx.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/timer/timer-uclass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index e9802c8b43..f8a092b8cb 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -4,14 +4,15 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <cpu.h>
 #include <dm.h>
-#include <init.h>
 #include <dm/lists.h>
+#include <dm/device_compat.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
-#include <clk.h>
 #include <errno.h>
+#include <init.h>
 #include <timer.h>
 #include <linux/err.h>
 
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 12/16] usb: xhci: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
This header is necessary for the dev_xxx macros.

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/usb/host/xhci-mtk.c | 5 +++--
 drivers/usb/host/xhci.c     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index f3f181dae0..f62e232d21 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -7,15 +7,16 @@
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <malloc.h>
+#include <power/regulator.h>
 #include <usb.h>
+#include <usb/xhci.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
-#include <power/regulator.h>
 #include <linux/iopoll.h>
-#include <usb/xhci.h>
 
 /* IPPC (IP Port Control) registers */
 #define IPPC_IP_PW_CTRL0 0x00
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 3547a9bad1..7080f8fabe 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -22,11 +22,13 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <log.h>
-#include <asm/byteorder.h>
-#include <usb.h>
 #include <malloc.h>
+#include <usb.h>
+#include <usb/xhci.h>
 #include <watchdog.h>
+#include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
@@ -34,7 +36,6 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
-#include <usb/xhci.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 13/16] usb: musb-new: Include device_compat.h

Sean Anderson
In reply to this post by Sean Anderson
This was included, but was ifdef'd out. We also need dm.h for struct
udevice.

Signed-off-by: Sean Anderson <[hidden email]>
---

 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 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 961de99795..22811a5efb 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -80,6 +80,8 @@
 #include <linux/io.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <usb.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index eb590885bc..236bab3dc1 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,6 +32,8 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <asm/omap_musb.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index 8ba98d8c0e..5b149dac6d 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,6 +23,8 @@
 #include <linux/slab.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 93f43ba471..cbd92fca6b 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,8 +19,10 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
-#include "linux-compat.h"
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <asm/processor.h>
+#include "linux-compat.h"
 #endif
 
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c
index 5fa013659c..acb2d40f3b 100644
--- a/drivers/usb/musb-new/musb_host.c
+++ b/drivers/usb/musb-new/musb_host.c
@@ -22,6 +22,8 @@
 #include <linux/dma-mapping.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <usb.h>
 #include <linux/bug.h>
 #include "linux-compat.h"
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 14/16] usb: musb-new: mt85xx: Fix not calling dev_err with a device

Sean Anderson
In reply to this post by Sean Anderson
This driver doesn't use DM (in the correct places), so we use a device and
not a udevice. We also need to include device_compat.h

Signed-off-by: Sean Anderson <[hidden email]>
---

 drivers/usb/musb-new/mt85xx.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c281c38a28..8f0561eeba 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
@@ -244,17 +245,17 @@ static int mtk_musb_init(struct musb *musb)
 
  ret = clk_enable(&glue->usbpllclk);
  if (ret) {
- dev_err(dev, "failed to enable usbpll clock\n");
+ dev_err(musb->controller, "failed to enable usbpll clock\n");
  return ret;
  }
  ret = clk_enable(&glue->usbmcuclk);
  if (ret) {
- dev_err(dev, "failed to enable usbmcu clock\n");
+ dev_err(musb->controller, "failed to enable usbmcu clock\n");
  return ret;
  }
  ret = clk_enable(&glue->usbclk);
  if (ret) {
- dev_err(dev, "failed to enable usb clock\n");
+ dev_err(musb->controller, "failed to enable usb clock\n");
  return ret;
  }
 
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 15/16] linux/compat.h: Remove redefinition of dev_xxx macros

Sean Anderson
In reply to this post by Sean Anderson
All users of these functions now include dm/device_compat.h directly.

Signed-off-by: Sean Anderson <[hidden email]>
---

 include/linux/compat.h | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/include/linux/compat.h b/include/linux/compat.h
index d129780312..38549baa25 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -24,34 +24,6 @@ struct p_current{
 
 extern struct p_current *current;
 
-/* avoid conflict with <dm/device.h> */
-#ifdef dev_dbg
-#undef dev_dbg
-#endif
-#ifdef dev_vdbg
-#undef dev_vdbg
-#endif
-#ifdef dev_info
-#undef dev_info
-#endif
-#ifdef dev_err
-#undef dev_err
-#endif
-#ifdef dev_warn
-#undef dev_warn
-#endif
-
-#define dev_dbg(dev, fmt, args...) \
- debug(fmt, ##args)
-#define dev_vdbg(dev, fmt, args...) \
- debug(fmt, ##args)
-#define dev_info(dev, fmt, args...) \
- printf(fmt, ##args)
-#define dev_err(dev, fmt, args...) \
- printf(fmt, ##args)
-#define dev_warn(dev, fmt, args...) \
- printf(fmt, ##args)
-
 #define GFP_ATOMIC ((gfp_t) 0)
 #define GFP_KERNEL ((gfp_t) 0)
 #define GFP_NOFS ((gfp_t) 0)
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

[PATCH 16/16] dm: Don't undefine dev_xxx macros

Sean Anderson
In reply to this post by Sean Anderson
Now that linux/compat.h does not define these macros, we do not need to
undefine them.

Signed-off-by: Sean Anderson <[hidden email]>
---

 include/dm/device_compat.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/dm/device_compat.h b/include/dm/device_compat.h
index 8f26053b45..82d7a7d492 100644
--- a/include/dm/device_compat.h
+++ b/include/dm/device_compat.h
@@ -15,26 +15,6 @@
 #include <linux/build_bug.h>
 #include <linux/compat.h>
 
-/*
- * REVISIT:
- * remove the following after resolving conflicts with <linux/compat.h>
- */
-#ifdef dev_dbg
-#undef dev_dbg
-#endif
-#ifdef dev_vdbg
-#undef dev_vdbg
-#endif
-#ifdef dev_info
-#undef dev_info
-#endif
-#ifdef dev_err
-#undef dev_err
-#endif
-#ifdef dev_warn
-#undef dev_warn
-#endif
-
 /*
  * Define a new identifier which can be tested on by C code. A similar
  * definition is made for DEBUG in <log.h>.
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

RE: [EXT] [PATCH 08/16] spi: nsp_fspi: Include device_compat.h

Kuldeep Singh
In reply to this post by Sean Anderson

> -----Original Message-----
> From: Sean Anderson <[hidden email]>
> Sent: Monday, October 5, 2020 7:10 AM
> To: [hidden email]
> Cc: Sean Anderson <[hidden email]>; Jagan Teki
> <[hidden email]>; Kuldeep Singh <[hidden email]>
> Subject: [EXT] [PATCH 08/16] spi: nsp_fspi: Include device_compat.h

s/nsp_fspi/nxp_fspi

-Kuldeep
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 02/16] dm: syscon: Set LOG_CATEGORY

Simon Glass-3
In reply to this post by Sean Anderson
On Sun, 4 Oct 2020 at 19:40, Sean Anderson <[hidden email]> wrote:
>
> We call log_debug, but do not have a category set.
>
> Signed-off-by: Sean Anderson <[hidden email]>
> ---
>
>  drivers/core/syscon-uclass.c | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Simon Glass <[hidden email]>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 03/16] firmware: scmi: Include device_compat.h

Simon Glass-3
In reply to this post by Sean Anderson
On Sun, 4 Oct 2020 at 19:40, Sean Anderson <[hidden email]> wrote:

>
> This header is necessary for the dev_xxx macros.
>
> Signed-off-by: Sean Anderson <[hidden email]>
> ---
>
>  drivers/firmware/scmi/mailbox_agent.c     | 1 +
>  drivers/firmware/scmi/scmi_agent-uclass.c | 1 +
>  drivers/firmware/scmi/smt.c               | 1 +
>  3 files changed, 3 insertions(+)
>

Reviewed-by: Simon Glass <[hidden email]>
123