4 files changed, 3 insertions, 27 deletions

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 2c05ec9cf352..dca0b51435e9 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -2,6 +2,8 @@ config USB_DWC3
         tristate "DesignWare USB3 DRD Core Support"
         depends on (USB || USB_GADGET)
         select USB_OTG_UTILS
+        select USB_GADGET_DUALSPEED
+        select USB_GADGET_SUPERSPEED
         select USB_XHCI_PLATFORM
         help
           Say Y or M here if your system has a Dual Role SuperSpeed
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 0926e71142b9..900ae74357f1 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -5,11 +5,7 @@ obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
 dwc3-y                                  := core.o
 dwc3-y                                  += host.o
-
-ifneq ($(CONFIG_USB_GADGET_DWC3),)
-        dwc3-y                          += gadget.o ep0.o
-endif
-
+dwc3-y                                  += gadget.o ep0.o
 
 ifneq ($(CONFIG_DEBUG_FS),)
         dwc3-y                          += debugfs.o
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 71145a449d99..6dec6d94e547 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -110,18 +110,8 @@ static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req)
         list_move_tail(&req->list, &dep->req_queued);
 }
 
-#if defined(CONFIG_USB_GADGET_DWC3) || defined(CONFIG_USB_GADGET_DWC3_MODULE)
 int dwc3_gadget_init(struct dwc3 *dwc);
 void dwc3_gadget_exit(struct dwc3 *dwc);
-#else
-static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; }
-static inline void dwc3_gadget_exit(struct dwc3 *dwc) { }
-static inline int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
-                unsigned cmd, struct dwc3_gadget_ep_cmd_params *params)
-{
-        return 0;
-}
-#endif
 
 void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
                 int status);
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 23a447373c51..d64072c06ef3 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -318,18 +318,6 @@ config USB_PXA_U2O
           PXA9xx Processor series include a high speed USB2.0 device
           controller, which support high speed and full speed USB peripheral.
 
-config USB_GADGET_DWC3
-        tristate "DesignWare USB3.0 (DRD) Controller"
-        depends on USB_DWC3
-        select USB_GADGET_DUALSPEED
-        select USB_GADGET_SUPERSPEED
-        help
-          DesignWare USB3.0 controller is a SuperSpeed USB3.0 Controller
-          which can be configured for peripheral-only, host-only, hub-only
-          and Dual-Role operation. This Controller was first integrated into
-          the OMAP5 series of processors. More information about the OMAP5
-          version of this controller, refer to http://www.ti.com/omap5.
-
 #
 # Controllers available in both integrated and discrete versions
 #