usb: gadget: libcomposite: add epautoconf.c to libcomposite

This patch adds epautoconf.c into libcomposite and updates all gadgets.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 9515ed0163b71f8e4998cb732a799f7939910e4c..23d705f194ac18d6e140a43204f0a2e70cd1c6a6 100644 (file)
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -5,7 +5,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USB_GADGET)       += udc-core.o
 obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
-libcomposite-y                 := usbstring.o config.o
+libcomposite-y                 := usbstring.o config.o epautoconf.o
 obj-$(CONFIG_USB_DUMMY_HCD)    += dummy_hcd.o
 obj-$(CONFIG_USB_NET2272)      += net2272.o
 obj-$(CONFIG_USB_NET2280)      += net2280.o

diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c
index 3078d797f634f72b26dabe5d3ee5b09c005913fb..5db661d8590b00e435f689a3b2e4e597d4fe2eb8 100644 (file)
--- a/drivers/usb/gadget/acm_ms.c
+++ b/drivers/usb/gadget/acm_ms.c
@@ -42,7 +42,6 @@
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 #include "u_serial.c"
 #include "f_acm.c"
 #include "f_mass_storage.c"

diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c
index 9e85df22e796f0a550b2019889df95badd7ce1bc..689d1422a1c00b6b53310a2825d6800a246c9f50 100644 (file)
--- a/drivers/usb/gadget/audio.c
+++ b/drivers/usb/gadget/audio.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/utsname.h>
 
+#include "gadget_chips.h"
 #define DRIVER_DESC            "Linux USB Audio Gadget"
 #define DRIVER_VERSION         "Feb 2, 2012"
 
@@ -27,7 +28,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 /* string IDs are assigned dynamically */
 

diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index d06d0791c70ecf82614935647fc2ee9e38bf60cb..8e386cf377a5139c1dc350b5eb6d3ab8aed1e066 100644 (file)
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -44,7 +44,6 @@
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 #include "u_serial.c"
 #include "f_acm.c"
 #include "f_ecm.c"

diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index cc1746597aab07c3633618510ccc2283dc3feea8..87d16502816298ec059ce5c7b59df7dfe80adb11 100644 (file)
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -13,9 +13,6 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
-/* See comments in "zero.c" */
-#include "epautoconf.c"
-
 #ifdef CONFIG_USB_G_DBGP_SERIAL
 #include "u_serial.c"
 #endif

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index d5a905dbed005e92a92264b3d6a7cfd679e4021d..a777f7bd11b46971c30d7aaef32080e5c7139e6f 100644 (file)
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/device.h>
@@ -315,6 +316,7 @@ found_ep:
        ep->comp_desc = NULL;
        return ep;
 }
+EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss);
 
 /**
  * usb_ep_autoconfig() - choose an endpoint matching the
@@ -354,7 +356,7 @@ struct usb_ep *usb_ep_autoconfig(
 {
        return usb_ep_autoconfig_ss(gadget, desc, NULL);
 }
-
+EXPORT_SYMBOL_GPL(usb_ep_autoconfig);
 
 /**
  * usb_ep_autoconfig_reset - reset endpoint autoconfig state
@@ -375,4 +377,4 @@ void usb_ep_autoconfig_reset (struct usb_gadget *gadget)
        gadget->in_epnum = 0;
        gadget->out_epnum = 0;
 }
-
+EXPORT_SYMBOL_GPL(usb_ep_autoconfig_reset);

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 557021e267eee74f24060c5761b4c2a570401321..39eb718f796ad9e3d12729a46ba7d222710b5fc5 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -103,7 +103,6 @@ static inline bool has_rndis(void)
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_ecm.c"
 #include "f_subset.c"

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 77cf1083099f94ed30d338f3957b9ec5dad3393c..ce362f7e39d38b6356bb2a5128429116f8a230bd 100644 (file)
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -256,19 +256,6 @@
 
 #include "gadget_chips.h"
 
-
-
-/*
- * Kbuild is not very cooperative with respect to linking separately
- * compiled library objects into one module.  So for now we won't use
- * separate compilation ... ensuring init/exit sections work to shrink
- * the runtime footprint, and giving us at least some parts of what
- * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
- */
-#include "epautoconf.c"
-
-/*-------------------------------------------------------------------------*/
-
 #define DRIVER_DESC            "File-backed Storage Gadget"
 #define DRIVER_NAME            "g_file_storage"
 #define DRIVER_VERSION         "1 September 2010"

diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index 240957048d3fa2c93de7876a693af1f977048986..c3a583ea9938e92e586cbe95917213f0d7690463 100644 (file)
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -24,7 +24,6 @@
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 
 #if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS
 #  if defined USB_ETH_RNDIS

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 0ccca58e7a8fa5f479ec1c5d496e4e340b3faa4d..ba4e302e77d786492c3a62a6660102c926c14602 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -15,6 +15,8 @@
 #ifndef __GADGET_CHIPS_H
 #define __GADGET_CHIPS_H
 
+#include <linux/usb/gadget.h>
+
 /*
  * NOTICE: the entries below are alphabetical and should be kept
  * that way.

diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 68a79b42c5a8a4df6ab95ec1cb0347dea0c3cfec..0c70708ef80f807d21581b4fa346cfec323a0873 100644 (file)
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -38,7 +38,6 @@
 #include "gadget_chips.h"
 
 #include "composite.c"
-#include "epautoconf.c"
 #include "f_midi.c"
 
 /*-------------------------------------------------------------------------*/

diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c
index 917c6eda916ac6c775ae52117b202b52696819ec..4880cdd9de43c3030150e174292171c0651192d6 100644 (file)
--- a/drivers/usb/gadget/hid.c
+++ b/drivers/usb/gadget/hid.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/list.h>
 
+#include "gadget_chips.h"
 #define DRIVER_DESC            "HID Gadget"
 #define DRIVER_VERSION         "2010/03/16"
 
@@ -35,7 +36,6 @@
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_hid.c"
 

diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 9675e61c9a8da70e9bc810d59da72a370f0d2453..0b0f008427ed6c712fe337252729a25842afb156 100644 (file)
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -49,7 +49,6 @@
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 #include "f_mass_storage.c"
 
 /*-------------------------------------------------------------------------*/

diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 6b6c12802afcf9a37397a804da57bebafc44d805..72fb30141ff4784c5d0de1704558f0237e24b227 100644 (file)
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");
  */
 
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_mass_storage.c"
 

diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c
index ce8d08e44602e7ab4e215bdd43cf4d5ea0be91ca..69b660b79c091c0b7b25b77d37f4f8b51d3af3d2 100644 (file)
--- a/drivers/usb/gadget/ncm.c
+++ b/drivers/usb/gadget/ncm.c
@@ -37,7 +37,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_ncm.c"
 #include "u_ether.c"

diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index e2f4b9bdebc37876b064a17c87fc0ae88fdb1fac..6834c6204df3e03715336089be3303c60fd49663 100644 (file)
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -39,7 +39,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "u_serial.c"
 #include "f_acm.c"

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 310b22d423a77bdf3c90d6800e6e2d0f4290b13e..3d3d20d258f6c3f86438d95a3e859d928cbe39b1 100644 (file)
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -52,7 +52,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 /*-------------------------------------------------------------------------*/
 

diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 39990bed0905c45e1f4533095966850c0202811f..098c3d03deddac44945ff7d47044c27b84b12dd0 100644 (file)
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -38,7 +38,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_acm.c"
 #include "f_obex.c"

diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 926e0facfba5fdd380d631f8e42d69792b67f56a..e64a759f100d202bcced355884bd3eaa181b1b27 100644 (file)
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -25,7 +25,6 @@
 #include <target/configfs_macros.h>
 #include <asm/unaligned.h>
 
-#include "epautoconf.c"
 #include "composite.c"
 
 #include "tcm_usb_gadget.h"

diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c
index 5e500e8403fd475bfc5b1adb390af77ec414c289..66dfca86b21593059c2570eda95d9ffa5516b6fa 100644 (file)
--- a/drivers/usb/gadget/webcam.c
+++ b/drivers/usb/gadget/webcam.c
@@ -24,7 +24,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "uvc_queue.c"
 #include "uvc_video.c"

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index e39a3b5da101617afd8fe8bdaa870249e09cab4b..9a9adee2911a8a33ffda23983d8e0861e5a8ca29 100644 (file)
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -59,7 +59,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "epautoconf.c"
 
 #include "f_sourcesink.c"
 #include "f_loopback.c"