[PATCH next] usb: mtu3: fix build error caused by dev_xxx()

Chunfeng Yun chunfeng.yun at mediatek.com
Mon Oct 19 14:19:58 CEST 2020


Due to the following to patches:
4a1989c0bc77 ("dm: Don't undefine dev_xxx macros")
69dae8902b16 ("linux/compat.h: Remove redefinition of dev_xxx macros")

Need include device_compat.h and no need use __maybe_unused anymore
to fix unused variable warning

Signed-off-by: Chunfeng Yun <chunfeng.yun at mediatek.com>
---
Please squash in: ab703ebb1cc0 ("usb: add MediaTek USB3 DRD driver")
in u-boot-usb/next

Sorry for inconvenience
---
 drivers/usb/mtu3/mtu3.h        | 1 +
 drivers/usb/mtu3/mtu3_gadget.c | 4 ++--
 drivers/usb/mtu3/mtu3_plat.c   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index a51251c661..8a7ae83ee9 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index c981407b29..027b7e6111 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -306,7 +306,7 @@ static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req)
 	struct mtu3_ep *mep = to_mtu3_ep(ep);
 	struct mtu3_request *mreq = to_mtu3_request(req);
 	struct mtu3_request *r;
-	__maybe_unused struct mtu3 *mtu = mep->mtu;
+	struct mtu3 *mtu = mep->mtu;
 	unsigned long flags;
 	int ret = 0;
 
@@ -344,7 +344,7 @@ done:
 static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value)
 {
 	struct mtu3_ep *mep = to_mtu3_ep(ep);
-	__maybe_unused struct mtu3 *mtu = mep->mtu;
+	struct mtu3 *mtu = mep->mtu;
 	struct mtu3_request *mreq;
 	unsigned long flags = 0;
 	int ret = 0;
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 24ffdb360a..3795e695e8 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -347,7 +347,8 @@ static int mtu3_glue_bind(struct udevice *parent)
 
 	ret = device_bind_driver_to_node(parent, driver, name, node, &dev);
 	if (ret)
-		dev_err("%s: not able to bind usb device mode\n", __func__);
+		dev_err(parent, "%s: not able to bind usb device mode\n",
+			__func__);
 
 	return ret;
 }
-- 
2.18.0


More information about the U-Boot mailing list