The drivers/usb/gadget directory contains many files.
Files which are related can be distributed into separate directories.
This patch moves the USB functions implementations into a separate directory.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
---
drivers/usb/gadget/Makefile | 30 +--------------------
drivers/usb/gadget/function/Makefile | 31 ++++++++++++++++++++++
drivers/usb/gadget/{ => function}/f_acm.c | 2 +-
drivers/usb/gadget/{ => function}/f_ecm.c | 0
drivers/usb/gadget/{ => function}/f_eem.c | 0
drivers/usb/gadget/{ => function}/f_fs.c | 2 +-
drivers/usb/gadget/{ => function}/f_hid.c | 2 +-
drivers/usb/gadget/{ => function}/f_loopback.c | 2 +-
drivers/usb/gadget/{ => function}/f_mass_storage.c | 4 +--
drivers/usb/gadget/{ => function}/f_mass_storage.h | 0
drivers/usb/gadget/{ => function}/f_midi.c | 2 +-
drivers/usb/gadget/{ => function}/f_ncm.c | 0
drivers/usb/gadget/{ => function}/f_obex.c | 2 +-
drivers/usb/gadget/{ => function}/f_phonet.c | 0
drivers/usb/gadget/{ => function}/f_rndis.c | 0
drivers/usb/gadget/{ => function}/f_serial.c | 2 +-
drivers/usb/gadget/{ => function}/f_sourcesink.c | 4 +--
drivers/usb/gadget/{ => function}/f_subset.c | 0
drivers/usb/gadget/{ => function}/f_uac1.c | 0
drivers/usb/gadget/{ => function}/f_uac2.c | 0
drivers/usb/gadget/{ => function}/f_uvc.c | 0
drivers/usb/gadget/{ => function}/f_uvc.h | 0
drivers/usb/gadget/{ => function}/g_zero.h | 0
drivers/usb/gadget/{ => function}/ndis.h | 0
drivers/usb/gadget/{ => function}/rndis.c | 0
drivers/usb/gadget/{ => function}/rndis.h | 0
drivers/usb/gadget/{ => function}/storage_common.c | 0
drivers/usb/gadget/{ => function}/storage_common.h | 0
drivers/usb/gadget/{ => function}/u_ecm.h | 0
drivers/usb/gadget/{ => function}/u_eem.h | 0
drivers/usb/gadget/{ => function}/u_ether.c | 0
drivers/usb/gadget/{ => function}/u_ether.h | 2 +-
.../usb/gadget/{ => function}/u_ether_configfs.h | 0
drivers/usb/gadget/{ => function}/u_fs.h | 0
drivers/usb/gadget/{ => function}/u_gether.h | 0
drivers/usb/gadget/{ => function}/u_ncm.h | 0
drivers/usb/gadget/{ => function}/u_phonet.h | 0
drivers/usb/gadget/{ => function}/u_rndis.h | 0
drivers/usb/gadget/{ => function}/u_serial.c | 0
drivers/usb/gadget/{ => function}/u_serial.h | 0
drivers/usb/gadget/{ => function}/u_uac1.c | 0
drivers/usb/gadget/{ => function}/u_uac1.h | 2 +-
drivers/usb/gadget/{ => function}/uvc.h | 0
drivers/usb/gadget/{ => function}/uvc_queue.c | 0
drivers/usb/gadget/{ => function}/uvc_queue.h | 0
drivers/usb/gadget/{ => function}/uvc_v4l2.c | 0
drivers/usb/gadget/{ => function}/uvc_video.c | 0
drivers/usb/gadget/legacy/acm_ms.c | 4 +--
drivers/usb/gadget/legacy/audio.c | 8 +++---
drivers/usb/gadget/legacy/cdc2.c | 6 ++---
drivers/usb/gadget/legacy/dbgp.c | 2 +-
drivers/usb/gadget/legacy/ether.c | 12 ++++-----
drivers/usb/gadget/legacy/g_ffs.c | 12 ++++-----
drivers/usb/gadget/legacy/gmidi.c | 2 +-
drivers/usb/gadget/legacy/hid.c | 2 +-
drivers/usb/gadget/legacy/mass_storage.c | 2 +-
drivers/usb/gadget/legacy/multi.c | 12 ++++-----
drivers/usb/gadget/legacy/ncm.c | 4 +--
drivers/usb/gadget/legacy/nokia.c | 8 +++---
drivers/usb/gadget/legacy/serial.c | 2 +-
drivers/usb/gadget/legacy/webcam.c | 10 +++----
drivers/usb/gadget/legacy/zero.c | 2 +-
62 files changed, 89 insertions(+), 86 deletions(-)
create mode 100644 drivers/usb/gadget/function/Makefile
rename drivers/usb/gadget/{ => function}/f_acm.c (99%)
rename drivers/usb/gadget/{ => function}/f_ecm.c (100%)
rename drivers/usb/gadget/{ => function}/f_eem.c (100%)
rename drivers/usb/gadget/{ => function}/f_fs.c (99%)
rename drivers/usb/gadget/{ => function}/f_hid.c (99%)
rename drivers/usb/gadget/{ => function}/f_loopback.c (99%)
rename drivers/usb/gadget/{ => function}/f_mass_storage.c (99%)
rename drivers/usb/gadget/{ => function}/f_mass_storage.h (100%)
rename drivers/usb/gadget/{ => function}/f_midi.c (99%)
rename drivers/usb/gadget/{ => function}/f_ncm.c (100%)
rename drivers/usb/gadget/{ => function}/f_obex.c (99%)
rename drivers/usb/gadget/{ => function}/f_phonet.c (100%)
rename drivers/usb/gadget/{ => function}/f_rndis.c (100%)
rename drivers/usb/gadget/{ => function}/f_serial.c (99%)
rename drivers/usb/gadget/{ => function}/f_sourcesink.c (99%)
rename drivers/usb/gadget/{ => function}/f_subset.c (100%)
rename drivers/usb/gadget/{ => function}/f_uac1.c (100%)
rename drivers/usb/gadget/{ => function}/f_uac2.c (100%)
rename drivers/usb/gadget/{ => function}/f_uvc.c (100%)
rename drivers/usb/gadget/{ => function}/f_uvc.h (100%)
rename drivers/usb/gadget/{ => function}/g_zero.h (100%)
rename drivers/usb/gadget/{ => function}/ndis.h (100%)
rename drivers/usb/gadget/{ => function}/rndis.c (100%)
rename drivers/usb/gadget/{ => function}/rndis.h (100%)
rename drivers/usb/gadget/{ => function}/storage_common.c (100%)
rename drivers/usb/gadget/{ => function}/storage_common.h (100%)
rename drivers/usb/gadget/{ => function}/u_ecm.h (100%)
rename drivers/usb/gadget/{ => function}/u_eem.h (100%)
rename drivers/usb/gadget/{ => function}/u_ether.c (100%)
rename drivers/usb/gadget/{ => function}/u_ether.h (99%)
rename drivers/usb/gadget/{ => function}/u_ether_configfs.h (100%)
rename drivers/usb/gadget/{ => function}/u_fs.h (100%)
rename drivers/usb/gadget/{ => function}/u_gether.h (100%)
rename drivers/usb/gadget/{ => function}/u_ncm.h (100%)
rename drivers/usb/gadget/{ => function}/u_phonet.h (100%)
rename drivers/usb/gadget/{ => function}/u_rndis.h (100%)
rename drivers/usb/gadget/{ => function}/u_serial.c (100%)
rename drivers/usb/gadget/{ => function}/u_serial.h (100%)
rename drivers/usb/gadget/{ => function}/u_uac1.c (100%)
rename drivers/usb/gadget/{ => function}/u_uac1.h (97%)
rename drivers/usb/gadget/{ => function}/uvc.h (100%)
rename drivers/usb/gadget/{ => function}/uvc_queue.c (100%)
rename drivers/usb/gadget/{ => function}/uvc_queue.h (100%)
rename drivers/usb/gadget/{ => function}/uvc_v4l2.c (100%)
rename drivers/usb/gadget/{ => function}/uvc_video.c (100%)
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 09c7567..5364c64 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -4,35 +4,7 @@
ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
-obj-$(CONFIG_USB_GADGET) += legacy/ udc/
+obj-$(CONFIG_USB_GADGET) += legacy/ udc/ function/
obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
libcomposite-y := usbstring.o config.o epautoconf.o
libcomposite-y += composite.o functions.o configfs.o u_f.o
-
-# USB Functions
-usb_f_acm-y := f_acm.o
-obj-$(CONFIG_USB_F_ACM) += usb_f_acm.o
-usb_f_ss_lb-y := f_loopback.o f_sourcesink.o
-obj-$(CONFIG_USB_F_SS_LB) += usb_f_ss_lb.o
-obj-$(CONFIG_USB_U_SERIAL) += u_serial.o
-usb_f_serial-y := f_serial.o
-obj-$(CONFIG_USB_F_SERIAL) += usb_f_serial.o
-usb_f_obex-y := f_obex.o
-obj-$(CONFIG_USB_F_OBEX) += usb_f_obex.o
-obj-$(CONFIG_USB_U_ETHER) += u_ether.o
-usb_f_ncm-y := f_ncm.o
-obj-$(CONFIG_USB_F_NCM) += usb_f_ncm.o
-usb_f_ecm-y := f_ecm.o
-obj-$(CONFIG_USB_F_ECM) += usb_f_ecm.o
-usb_f_phonet-y := f_phonet.o
-obj-$(CONFIG_USB_F_PHONET) += usb_f_phonet.o
-usb_f_eem-y := f_eem.o
-obj-$(CONFIG_USB_F_EEM) += usb_f_eem.o
-usb_f_ecm_subset-y := f_subset.o
-obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o
-usb_f_rndis-y := f_rndis.o rndis.o
-obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o
-usb_f_mass_storage-y := f_mass_storage.o storage_common.o
-obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
-usb_f_fs-y := f_fs.o
-obj-$(CONFIG_USB_F_FS) += usb_f_fs.o
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
new file mode 100644
index 0000000..04ac3e7
--- /dev/null
+++ b/drivers/usb/gadget/function/Makefile
@@ -0,0 +1,31 @@
+#
+# USB peripheral controller drivers
+#
+
+# USB Functions
+usb_f_acm-y := f_acm.o
+obj-$(CONFIG_USB_F_ACM) += usb_f_acm.o
+usb_f_ss_lb-y := f_loopback.o f_sourcesink.o
+obj-$(CONFIG_USB_F_SS_LB) += usb_f_ss_lb.o
+obj-$(CONFIG_USB_U_SERIAL) += u_serial.o
+usb_f_serial-y := f_serial.o
+obj-$(CONFIG_USB_F_SERIAL) += usb_f_serial.o
+usb_f_obex-y := f_obex.o
+obj-$(CONFIG_USB_F_OBEX) += usb_f_obex.o
+obj-$(CONFIG_USB_U_ETHER) += u_ether.o
+usb_f_ncm-y := f_ncm.o
+obj-$(CONFIG_USB_F_NCM) += usb_f_ncm.o
+usb_f_ecm-y := f_ecm.o
+obj-$(CONFIG_USB_F_ECM) += usb_f_ecm.o
+usb_f_phonet-y := f_phonet.o
+obj-$(CONFIG_USB_F_PHONET) += usb_f_phonet.o
+usb_f_eem-y := f_eem.o
+obj-$(CONFIG_USB_F_EEM) += usb_f_eem.o
+usb_f_ecm_subset-y := f_subset.o
+obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o
+usb_f_rndis-y := f_rndis.o rndis.o
+obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o
+usb_f_mass_storage-y := f_mass_storage.o storage_common.o
+obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
+usb_f_fs-y := f_fs.o
+obj-$(CONFIG_USB_F_FS) += usb_f_fs.o
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/function/f_acm.c
similarity index 99%
rename from drivers/usb/gadget/f_acm.c
rename to drivers/usb/gadget/function/f_acm.c
index 5ddee95..909df2f 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -21,7 +21,7 @@
#include <linux/err.h>
#include "u_serial.h"
-#include "udc/gadget_chips.h"
+#include "../udc/gadget_chips.h"
/*
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
similarity index 100%
rename from drivers/usb/gadget/f_ecm.c
rename to drivers/usb/gadget/function/f_ecm.c
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/function/f_eem.c
similarity index 100%
rename from drivers/usb/gadget/f_eem.c
rename to drivers/usb/gadget/function/f_eem.c
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/function/f_fs.c
similarity index 99%
rename from drivers/usb/gadget/f_fs.c
rename to drivers/usb/gadget/function/f_fs.c
index de92bd3..b6bb8d9 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -33,7 +33,7 @@
#include <linux/poll.h>
#include "u_fs.h"
-#include "configfs.h"
+#include "../configfs.h"
#define FUNCTIONFS_MAGIC 0xa647361 /* Chosen by a honest dice roll ;) */
diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/function/f_hid.c
similarity index 99%
rename from drivers/usb/gadget/f_hid.c
rename to drivers/usb/gadget/function/f_hid.c
index a95290a..3850b5c 100644
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -20,7 +20,7 @@
#include <linux/sched.h>
#include <linux/usb/g_hid.h>
-#include "u_f.h"
+#include "../u_f.h"
static int major, minors;
static struct class *hidg_class;
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
similarity index 99%
rename from drivers/usb/gadget/f_loopback.c
rename to drivers/usb/gadget/function/f_loopback.c
index 4557cd0..d2a2351 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -20,7 +20,7 @@
#include <linux/usb/composite.h>
#include "g_zero.h"
-#include "u_f.h"
+#include "../u_f.h"
/*
* LOOPBACK FUNCTION ... a testing vehicle for USB peripherals,
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
similarity index 99%
rename from drivers/usb/gadget/f_mass_storage.c
rename to drivers/usb/gadget/function/f_mass_storage.c
index 44046a8..c764d88 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -219,8 +219,8 @@
#include <linux/usb/gadget.h>
#include <linux/usb/composite.h>
-#include "udc/gadget_chips.h"
-#include "configfs.h"
+#include "../udc/gadget_chips.h"
+#include "../configfs.h"
/*------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/f_mass_storage.h b/drivers/usb/gadget/function/f_mass_storage.h
similarity index 100%
rename from drivers/usb/gadget/f_mass_storage.h
rename to drivers/usb/gadget/function/f_mass_storage.h
diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/function/f_midi.c
similarity index 99%
rename from drivers/usb/gadget/f_midi.c
rename to drivers/usb/gadget/function/f_midi.c
index 807b31c..8d8f509 100644
--- a/drivers/usb/gadget/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -32,7 +32,7 @@
#include <linux/usb/audio.h>
#include <linux/usb/midi.h>
-#include "u_f.h"
+#include "../u_f.h"
MODULE_AUTHOR("Ben Williamson");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
similarity index 100%
rename from drivers/usb/gadget/f_ncm.c
rename to drivers/usb/gadget/function/f_ncm.c
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/function/f_obex.c
similarity index 99%
rename from drivers/usb/gadget/f_obex.c
rename to drivers/usb/gadget/function/f_obex.c
index 867f808..62afe7c 100644
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -20,7 +20,7 @@
#include <linux/module.h>
#include "u_serial.h"
-#include "udc/gadget_chips.h"
+#include "../udc/gadget_chips.h"
/*
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
similarity index 100%
rename from drivers/usb/gadget/f_phonet.c
rename to drivers/usb/gadget/function/f_phonet.c
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
similarity index 100%
rename from drivers/usb/gadget/f_rndis.c
rename to drivers/usb/gadget/function/f_rndis.c
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/function/f_serial.c
similarity index 99%
rename from drivers/usb/gadget/f_serial.c
rename to drivers/usb/gadget/function/f_serial.c
index 35af638..efce83e 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -16,7 +16,7 @@
#include <linux/device.h>
#include "u_serial.h"
-#include "udc/gadget_chips.h"
+#include "../udc/gadget_chips.h"
/*
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
similarity index 99%
rename from drivers/usb/gadget/f_sourcesink.c
rename to drivers/usb/gadget/function/f_sourcesink.c
index fbd51f5..3358952 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -20,8 +20,8 @@
#include <linux/err.h>
#include "g_zero.h"
-#include "udc/gadget_chips.h"
-#include "u_f.h"
+#include "../udc/gadget_chips.h"
+#include "../u_f.h"
/*
* SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/function/f_subset.c
similarity index 100%
rename from drivers/usb/gadget/f_subset.c
rename to drivers/usb/gadget/function/f_subset.c
diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
similarity index 100%
rename from drivers/usb/gadget/f_uac1.c
rename to drivers/usb/gadget/function/f_uac1.c
diff --git a/drivers/usb/gadget/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
similarity index 100%
rename from drivers/usb/gadget/f_uac2.c
rename to drivers/usb/gadget/function/f_uac2.c
diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
similarity index 100%
rename from drivers/usb/gadget/f_uvc.c
rename to drivers/usb/gadget/function/f_uvc.c
diff --git a/drivers/usb/gadget/f_uvc.h b/drivers/usb/gadget/function/f_uvc.h
similarity index 100%
rename from drivers/usb/gadget/f_uvc.h
rename to drivers/usb/gadget/function/f_uvc.h
diff --git a/drivers/usb/gadget/g_zero.h b/drivers/usb/gadget/function/g_zero.h
similarity index 100%
rename from drivers/usb/gadget/g_zero.h
rename to drivers/usb/gadget/function/g_zero.h
diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/function/ndis.h
similarity index 100%
rename from drivers/usb/gadget/ndis.h
rename to drivers/usb/gadget/function/ndis.h
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/function/rndis.c
similarity index 100%
rename from drivers/usb/gadget/rndis.c
rename to drivers/usb/gadget/function/rndis.c
diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/function/rndis.h
similarity index 100%
rename from drivers/usb/gadget/rndis.h
rename to drivers/usb/gadget/function/rndis.h
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/function/storage_common.c
similarity index 100%
rename from drivers/usb/gadget/storage_common.c
rename to drivers/usb/gadget/function/storage_common.c
diff --git a/drivers/usb/gadget/storage_common.h b/drivers/usb/gadget/function/storage_common.h
similarity index 100%
rename from drivers/usb/gadget/storage_common.h
rename to drivers/usb/gadget/function/storage_common.h
diff --git a/drivers/usb/gadget/u_ecm.h b/drivers/usb/gadget/function/u_ecm.h
similarity index 100%
rename from drivers/usb/gadget/u_ecm.h
rename to drivers/usb/gadget/function/u_ecm.h
diff --git a/drivers/usb/gadget/u_eem.h b/drivers/usb/gadget/function/u_eem.h
similarity index 100%
rename from drivers/usb/gadget/u_eem.h
rename to drivers/usb/gadget/function/u_eem.h
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/function/u_ether.c
similarity index 100%
rename from drivers/usb/gadget/u_ether.c
rename to drivers/usb/gadget/function/u_ether.c
diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/function/u_ether.h
similarity index 99%
rename from drivers/usb/gadget/u_ether.h
rename to drivers/usb/gadget/function/u_ether.h
index 7a20ee7..6df8184 100644
--- a/drivers/usb/gadget/u_ether.h
+++ b/drivers/usb/gadget/function/u_ether.h
@@ -19,7 +19,7 @@
#include <linux/usb/composite.h>
#include <linux/usb/cdc.h>
-#include "udc/gadget_chips.h"
+#include "../udc/gadget_chips.h"
#define QMULT_DEFAULT 5
diff --git a/drivers/usb/gadget/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
similarity index 100%
rename from drivers/usb/gadget/u_ether_configfs.h
rename to drivers/usb/gadget/function/u_ether_configfs.h
diff --git a/drivers/usb/gadget/u_fs.h b/drivers/usb/gadget/function/u_fs.h
similarity index 100%
rename from drivers/usb/gadget/u_fs.h
rename to drivers/usb/gadget/function/u_fs.h
diff --git a/drivers/usb/gadget/u_gether.h b/drivers/usb/gadget/function/u_gether.h
similarity index 100%
rename from drivers/usb/gadget/u_gether.h
rename to drivers/usb/gadget/function/u_gether.h
diff --git a/drivers/usb/gadget/u_ncm.h b/drivers/usb/gadget/function/u_ncm.h
similarity index 100%
rename from drivers/usb/gadget/u_ncm.h
rename to drivers/usb/gadget/function/u_ncm.h
diff --git a/drivers/usb/gadget/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h
similarity index 100%
rename from drivers/usb/gadget/u_phonet.h
rename to drivers/usb/gadget/function/u_phonet.h
diff --git a/drivers/usb/gadget/u_rndis.h b/drivers/usb/gadget/function/u_rndis.h
similarity index 100%
rename from drivers/usb/gadget/u_rndis.h
rename to drivers/usb/gadget/function/u_rndis.h
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/function/u_serial.c
similarity index 100%
rename from drivers/usb/gadget/u_serial.c
rename to drivers/usb/gadget/function/u_serial.c
diff --git a/drivers/usb/gadget/u_serial.h b/drivers/usb/gadget/function/u_serial.h
similarity index 100%
rename from drivers/usb/gadget/u_serial.h
rename to drivers/usb/gadget/function/u_serial.h
diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
similarity index 100%
rename from drivers/usb/gadget/u_uac1.c
rename to drivers/usb/gadget/function/u_uac1.c
diff --git a/drivers/usb/gadget/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
similarity index 97%
rename from drivers/usb/gadget/u_uac1.h
rename to drivers/usb/gadget/function/u_uac1.h
index d936221..95685a8 100644
--- a/drivers/usb/gadget/u_uac1.h
+++ b/drivers/usb/gadget/function/u_uac1.h
@@ -21,7 +21,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
-#include "udc/gadget_chips.h"
+#include "../udc/gadget_chips.h"
/*
* This represents the USB side of an audio card device, managed by a USB
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/function/uvc.h
similarity index 100%
rename from drivers/usb/gadget/uvc.h
rename to drivers/usb/gadget/function/uvc.h
diff --git a/drivers/usb/gadget/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
similarity index 100%
rename from drivers/usb/gadget/uvc_queue.c
rename to drivers/usb/gadget/function/uvc_queue.c
diff --git a/drivers/usb/gadget/uvc_queue.h b/drivers/usb/gadget/function/uvc_queue.h
similarity index 100%
rename from drivers/usb/gadget/uvc_queue.h
rename to drivers/usb/gadget/function/uvc_queue.h
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
similarity index 100%
rename from drivers/usb/gadget/uvc_v4l2.c
rename to drivers/usb/gadget/function/uvc_v4l2.c
diff --git a/drivers/usb/gadget/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
similarity index 100%
rename from drivers/usb/gadget/uvc_video.c
rename to drivers/usb/gadget/function/uvc_video.c
diff --git a/drivers/usb/gadget/legacy/acm_ms.c b/drivers/usb/gadget/legacy/acm_ms.c
index 579daef..416b241 100644
--- a/drivers/usb/gadget/legacy/acm_ms.c
+++ b/drivers/usb/gadget/legacy/acm_ms.c
@@ -17,7 +17,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include "../u_serial.h"
+#include "../function/u_serial.h"
#define DRIVER_DESC "Composite Gadget (ACM + MS)"
#define DRIVER_VERSION "2011/10/10"
@@ -31,7 +31,7 @@
#define ACM_MS_VENDOR_NUM 0x1d6b /* Linux Foundation */
#define ACM_MS_PRODUCT_NUM 0x0106 /* Composite Gadget: ACM + MS*/
-#include "../f_mass_storage.h"
+#include "../function/f_mass_storage.h"
/*-------------------------------------------------------------------------*/
USB_GADGET_COMPOSITE_OPTIONS();
diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index c19496d..d03d881 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -41,11 +41,11 @@ static struct usb_gadget_strings *audio_strings[] = {
};
#ifdef CONFIG_GADGET_UAC1
-#include "../u_uac1.h"
-#include "../u_uac1.c"
-#include "../f_uac1.c"
+#include "../function/u_uac1.h"
+#include "../function/u_uac1.c"
+#include "../function/f_uac1.c"
#else
-#include "../f_uac2.c"
+#include "../function/f_uac2.c"
#endif
/*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c
index 5e4137f..20c33cb 100644
--- a/drivers/usb/gadget/legacy/cdc2.c
+++ b/drivers/usb/gadget/legacy/cdc2.c
@@ -13,9 +13,9 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include "../u_ether.h"
-#include "../u_serial.h"
-#include "../u_ecm.h"
+#include "../function/u_ether.h"
+#include "../function/u_serial.h"
+#include "../function/u_ecm.h"
#define DRIVER_DESC "CDC Composite Gadget"
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index 5c9cf13..9da8f6f 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -13,7 +13,7 @@
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
-#include "../u_serial.h"
+#include "../function/u_serial.h"
#define DRIVER_VENDOR_ID 0x0525 /* NetChip */
#define DRIVER_PRODUCT_ID 0xc0de /* undefined */
diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c
index 738b598..4bbb28a 100644
--- a/drivers/usb/gadget/legacy/ether.c
+++ b/drivers/usb/gadget/legacy/ether.c
@@ -23,7 +23,7 @@
# define USB_ETH_RNDIS y
#endif
-#include "../u_ether.h"
+#include "../function/u_ether.h"
/*
@@ -94,15 +94,15 @@ static inline bool has_rndis(void)
#include <linux/module.h>
-#include "../u_ecm.h"
-#include "../u_gether.h"
+#include "../function/u_ecm.h"
+#include "../function/u_gether.h"
#ifdef USB_ETH_RNDIS
-#include "../u_rndis.h"
-#include "../rndis.h"
+#include "../function/u_rndis.h"
+#include "../function/rndis.h"
#else
#define rndis_borrow_net(...) do {} while (0)
#endif
-#include "../u_eem.h"
+#include "../function/u_eem.h"
/*-------------------------------------------------------------------------*/
USB_GADGET_COMPOSITE_OPTIONS();
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index 94fe050..3287293 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -24,13 +24,13 @@
# define USB_ETH_RNDIS y
# endif
-# include "../u_ecm.h"
-# include "../u_gether.h"
+# include "../function/u_ecm.h"
+# include "../function/u_gether.h"
# ifdef USB_ETH_RNDIS
-# include "../u_rndis.h"
-# include "../rndis.h"
+# include "../function/u_rndis.h"
+# include "../function/rndis.h"
# endif
-# include "../u_ether.h"
+# include "../function/u_ether.h"
USB_ETHERNET_MODULE_PARAMETERS();
@@ -48,7 +48,7 @@ static struct usb_function *f_rndis;
# endif
#endif
-#include "../u_fs.h"
+#include "../function/u_fs.h"
#define DRIVER_NAME "g_ffs"
#define DRIVER_DESC "USB Function Filesystem"
diff --git a/drivers/usb/gadget/legacy/gmidi.c b/drivers/usb/gadget/legacy/gmidi.c
index 91a8aea..6d3c5fd 100644
--- a/drivers/usb/gadget/legacy/gmidi.c
+++ b/drivers/usb/gadget/legacy/gmidi.c
@@ -37,7 +37,7 @@
#include "../udc/gadget_chips.h"
-#include "../f_midi.c"
+#include "../function/f_midi.c"
/*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
index bafcfdc..c7e1da7 100644
--- a/drivers/usb/gadget/legacy/hid.c
+++ b/drivers/usb/gadget/legacy/hid.c
@@ -36,7 +36,7 @@
* the runtime footprint, and giving us at least some parts of what
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
-#include "../f_hid.c"
+#include "../function/f_hid.c"
struct hidg_func_node {
diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c
index 025f4b3..c0bdb3e 100644
--- a/drivers/usb/gadget/legacy/mass_storage.c
+++ b/drivers/usb/gadget/legacy/mass_storage.c
@@ -46,7 +46,7 @@
#define FSG_VENDOR_ID 0x0525 /* NetChip */
#define FSG_PRODUCT_ID 0xa4a5 /* Linux-USB File-backed Storage Gadget */
-#include "../f_mass_storage.h"
+#include "../function/f_mass_storage.h"
/*-------------------------------------------------------------------------*/
USB_GADGET_COMPOSITE_OPTIONS();
diff --git a/drivers/usb/gadget/legacy/multi.c b/drivers/usb/gadget/legacy/multi.c
index ba0a90f..6c4cce3 100644
--- a/drivers/usb/gadget/legacy/multi.c
+++ b/drivers/usb/gadget/legacy/multi.c
@@ -17,7 +17,7 @@
#include <linux/module.h>
#include <linux/netdevice.h>
-#include "../u_serial.h"
+#include "../function/u_serial.h"
#if defined USB_ETH_RNDIS
# undef USB_ETH_RNDIS
#endif
@@ -33,14 +33,14 @@ MODULE_AUTHOR("Michal Nazarewicz");
MODULE_LICENSE("GPL");
-#include "../f_mass_storage.h"
+#include "../function/f_mass_storage.h"
-#include "../u_ecm.h"
+#include "../function/u_ecm.h"
#ifdef USB_ETH_RNDIS
-# include "../u_rndis.h"
-# include "../rndis.h"
+# include "../function/u_rndis.h"
+# include "../function/rndis.h"
#endif
-#include "../u_ether.h"
+#include "../function/u_ether.h"
USB_GADGET_COMPOSITE_OPTIONS();
diff --git a/drivers/usb/gadget/legacy/ncm.c b/drivers/usb/gadget/legacy/ncm.c
index 8c39782..992812e 100644
--- a/drivers/usb/gadget/legacy/ncm.c
+++ b/drivers/usb/gadget/legacy/ncm.c
@@ -23,8 +23,8 @@
#include <linux/module.h>
#include <linux/usb/composite.h>
-#include "../u_ether.h"
-#include "../u_ncm.h"
+#include "../function/u_ether.h"
+#include "../function/u_ncm.h"
#define DRIVER_DESC "NCM Gadget"
diff --git a/drivers/usb/gadget/legacy/nokia.c b/drivers/usb/gadget/legacy/nokia.c
index e3b79db..02226c1 100644
--- a/drivers/usb/gadget/legacy/nokia.c
+++ b/drivers/usb/gadget/legacy/nokia.c
@@ -19,10 +19,10 @@
#include <linux/module.h>
#include <linux/device.h>
-#include "../u_serial.h"
-#include "../u_ether.h"
-#include "../u_phonet.h"
-#include "../u_ecm.h"
+#include "../function/u_serial.h"
+#include "../function/u_ether.h"
+#include "../function/u_phonet.h"
+#include "../function/u_ecm.h"
#include "../udc/gadget_chips.h"
/* Defines */
diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c
index ce3f69d..a4167bc 100644
--- a/drivers/usb/gadget/legacy/serial.c
+++ b/drivers/usb/gadget/legacy/serial.c
@@ -16,7 +16,7 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
-#include "../u_serial.h"
+#include "../function/u_serial.h"
#include "../udc/gadget_chips.h"
diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index c543863..7bdea5a 100644
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -14,7 +14,7 @@
#include <linux/device.h>
#include <linux/usb/video.h>
-#include "../f_uvc.h"
+#include "../function/f_uvc.h"
/*
* Kbuild is not very cooperative with respect to linking separately
@@ -23,10 +23,10 @@
* the runtime footprint, and giving us at least some parts of what
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
-#include "../uvc_queue.c"
-#include "../uvc_video.c"
-#include "../uvc_v4l2.c"
-#include "../f_uvc.c"
+#include "../function/uvc_queue.c"
+#include "../function/uvc_video.c"
+#include "../function/uvc_v4l2.c"
+#include "../function/f_uvc.c"
USB_GADGET_COMPOSITE_OPTIONS();
/* --------------------------------------------------------------------------
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c
index d97e78c..6a006c0 100644
--- a/drivers/usb/gadget/legacy/zero.c
+++ b/drivers/usb/gadget/legacy/zero.c
@@ -46,7 +46,7 @@
#include <linux/err.h>
#include <linux/usb/composite.h>
-#include "../g_zero.h"
+#include "../function/g_zero.h"
/*-------------------------------------------------------------------------*/
USB_GADGET_COMPOSITE_OPTIONS();
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
