rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / dummy_hcd.c

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 90977fc04ea452e818b9fab6d3eb85382922978a..d3dcabc1a5fca0e7ad221236285d4064b69abd0d 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -122,7 +122,10 @@ static const char ep0name [] = "ep0";
 static const char *const ep_name [] = {
        ep0name,                                /* everyone has ep0 */
 
-       /* act like a pxa250: fifteen fixed function endpoints */
+       /* act like a net2280: high speed, six configurable endpoints */
+       "ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",
+
+       /* or like pxa250: fifteen fixed function endpoints */
        "ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",
        "ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",
        "ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
@@ -130,10 +133,6 @@ static const char *const ep_name [] = {
 
        /* or like sa1100: two fixed function endpoints */
        "ep1out-bulk", "ep2in-bulk",
-
-       /* and now some generic EPs so we have enough in multi config */
-       "ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",
-       "ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",
 };
 #define DUMMY_ENDPOINTS        ARRAY_SIZE(ep_name)