On 06/13/2017 02:09 PM, Vignesh R wrote:
> From: Mugunthan V N <mugunthan...@ti.com>
>
> devm_zalloc() is already defined in dm/device.h header, so
> devm_zalloc can be removed from linux_compact.h beader file.
Shouldn't it be left in linux_compat.h instead ?
> Signed-off-by: Mugunthan V N <mugunthan...@ti.com>
> Signed-off-by: Vignesh R <vigne...@ti.com>
> Reviewed-by: Simon Glass <s...@chromium.org>
> ---
> drivers/usb/dwc3/core.c | 7 +++++--
> drivers/usb/dwc3/dwc3-omap.c | 3 ++-
> drivers/usb/dwc3/linux-compat.h | 5 -----
> drivers/usb/dwc3/ti_usb_phy.c | 1 +
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 87b9c87edf6a..98102bd6b00a 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -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);
>
> @@ -624,7 +626,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 3dcc2f484777..63551e780434 100644
> --- a/drivers/usb/dwc3/dwc3-omap.c
> +++ b/drivers/usb/dwc3/dwc3-omap.c
> @@ -20,6 +20,7 @@
> #include <dwc3-omap-uboot.h>
> #include <linux/usb/dwc3-omap.h>
> #include <linux/ioport.h>
> +#include <dm.h>
>
> #include <linux/usb/otg.h>
> #include <linux/compat.h>
> @@ -377,7 +378,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 9e944a31be11..f95d6152b7fe 100644
> --- a/drivers/usb/dwc3/linux-compat.h
> +++ b/drivers/usb/dwc3/linux-compat.h
> @@ -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
> diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
> index 218a8e586c8d..8088afc97047 100644
> --- a/drivers/usb/dwc3/ti_usb_phy.c
> +++ b/drivers/usb/dwc3/ti_usb_phy.c
> @@ -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"
>
>
--
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
