]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
drivers: usb: dwc3: remove devm_zalloc from linux_compact
authorMugunthan V N <mugunthanvnm@ti.com>
Mon, 11 Jan 2016 06:37:19 +0000 (12:07 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 11 Jan 2017 13:10:38 +0000 (14:10 +0100)
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>
drivers/usb/dwc3/core.c
drivers/usb/dwc3/dwc3-omap.c
drivers/usb/dwc3/linux-compat.h
drivers/usb/dwc3/ti_usb_phy.c

index 85cc96ac87b3d663574d33f2e174cb47011965e4..c599d0bac28332d3b2ab0f83b1d8791bfe2d82bb 100644 (file)
@@ -19,6 +19,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>
@@ -111,7 +112,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);
 
@@ -622,7 +624,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;
 
index 3dcc2f4847778b86aead3485e677db75f3829c9e..afbd845b9dd5b03246491569a1197c6956b20e49 100644 (file)
@@ -377,7 +377,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;
 
index 9e944a31be11f4edaccbfc857c493e3808ee3c53..f95d6152b7fee574493ae1dc70161f07021b68e1 100644 (file)
@@ -23,9 +23,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
index 4159e5a667cfe58b7ba62073199ecbcc36e7f396..3cc415d5086f999740666b567f1d9f5f8ef7d11c 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <dm.h>
 
 #include "linux-compat.h"