From 69d6cbe748ae13e6b728d2c28616a8c54b07f9c2 Mon Sep 17 00:00:00 2001
From: Lukasz Majewski <l.majewski@samsung.com>
Date: Tue, 17 Sep 2013 15:58:22 +0200
Subject: [PATCH] usb:gadget:Remove redundant #includes for USB composite
 gadget and its functions

Only the <linux/usb/gadget.h> requires error.h include. Hence, several
includes of error.h at USB gadget functions are not needed.

Moreover unnecessary malloc.h includes were also removed.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
---
 common/cmd_dfu.c              | 3 ---
 common/cmd_usb_mass_storage.c | 1 -
 drivers/usb/gadget/g_dnl.c    | 1 -
 include/linux/usb/gadget.h    | 1 +
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index d3658cf7ee..7ce92cec87 100644
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -9,10 +9,7 @@
  */
 
 #include <common.h>
-#include <command.h>
-#include <malloc.h>
 #include <dfu.h>
-#include <asm/errno.h>
 #include <g_dnl.h>
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index 33a4715005..ccf7195946 100644
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <errno.h>
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 19011bf9fc..29d08a3a22 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -7,7 +7,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <errno.h>
 #include <common.h>
 #include <malloc.h>
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 220d068600..a8a576316d 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -18,6 +18,7 @@
 #ifndef __LINUX_USB_GADGET_H
 #define __LINUX_USB_GADGET_H
 
+#include <errno.h>
 #include <linux/list.h>
 
 struct usb_ep;
-- 
2.25.1