[U-Boot] drivers: usb: dwc3: remove devm_zalloc from linux_compact

Message ID a989527edc23713c5df1532923bfc8d2e09aa290.1526476671.git.michal.simek@xilinx.com
State Superseded
Headers show
Series
  • [U-Boot] drivers: usb: dwc3: remove devm_zalloc from linux_compact
Related show

Commit Message

Michal Simek May 16, 2018, 1:17 p.m.
From: Mugunthan V N <mugunthanvnm@ti.com>

devm_zalloc() is already defined in dm/device.h header, so
devm_zalloc can be removed from linux_compact.h beader file.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Taken from https://patchwork.ozlabs.org/patch/775108/

"linux-compat.h is local to dwc3 folder where as dm/device.h is available
globally. My understanding is linux-compat.h is to define
functions/wrappers needed by dwc3 part picked from linux that are not
yet directly available in U-Boot. But, given that devm_kzalloc() is
provided in U-Boot, I thought it would be better to get rid of
definition in linux-compat.h in order to avoid conflicting definition
error."
---
 drivers/usb/dwc3/core.c         | 7 +++++--
 drivers/usb/dwc3/dwc3-omap.c    | 2 +-
 drivers/usb/dwc3/linux-compat.h | 5 -----
 drivers/usb/dwc3/ti_usb_phy.c   | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

Comments

Marek Vasut May 16, 2018, 1:19 p.m. | #1
On 05/16/2018 03:17 PM, Michal Simek wrote:
> From: Mugunthan V N <mugunthanvnm@ti.com>
> 
> devm_zalloc() is already defined in dm/device.h header, so
> devm_zalloc can be removed from linux_compact.h beader file.
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---

Applied, thanks

Patch

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7a91015048f5..dbdad22d1134 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -18,6 +18,7 @@ 
 #include <dwc3-uboot.h>
 #include <asm/dma-mapping.h>
 #include <linux/ioport.h>
+#include <dm.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -110,7 +111,8 @@  static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
 {
 	struct dwc3_event_buffer	*evt;
 
-	evt = devm_kzalloc(dwc->dev, sizeof(*evt), GFP_KERNEL);
+	evt = devm_kzalloc((struct udevice *)dwc->dev, sizeof(*evt),
+			   GFP_KERNEL);
 	if (!evt)
 		return ERR_PTR(-ENOMEM);
 
@@ -623,7 +625,8 @@  int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 
 	void			*mem;
 
-	mem = devm_kzalloc(dev, sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL);
+	mem = devm_kzalloc((struct udevice *)dev,
+			   sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL);
 	if (!mem)
 		return -ENOMEM;
 
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 64822ee73991..41b061241fe1 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -376,7 +376,7 @@  int dwc3_omap_uboot_init(struct dwc3_omap_device *omap_dev)
 	struct device		*dev = NULL;
 	struct dwc3_omap	*omap;
 
-	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
+	omap = devm_kzalloc((struct udevice *)dev, sizeof(*omap), GFP_KERNEL);
 	if (!omap)
 		return -ENOMEM;
 
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h
index 27ae21247b13..35850f91a36d 100644
--- a/drivers/usb/dwc3/linux-compat.h
+++ b/drivers/usb/dwc3/linux-compat.h
@@ -20,9 +20,4 @@  static inline size_t strlcat(char *dest, const char *src, size_t n)
 	return strlen(dest) + strlen(src);
 }
 
-static inline void *devm_kzalloc(struct device *dev, unsigned int size,
-				 unsigned int flags)
-{
-	return kzalloc(size, flags);
-}
 #endif
diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
index 925f56c97c81..d168e868e35e 100644
--- a/drivers/usb/dwc3/ti_usb_phy.c
+++ b/drivers/usb/dwc3/ti_usb_phy.c
@@ -23,6 +23,7 @@ 
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <dm.h>
 
 #include "linux-compat.h"