From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Date: Thu, 14 Mar 2013 15:14:26 +0000 (+0100)
Subject: usb: gadget: f_serial: remove compatibility layer
X-Git-Tag: firefly_0821_release~3680^2~672^2~11^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9786b4561228099f579ad88912aa305812526ea1;p=firefly-linux-kernel-4.4.55.git

usb: gadget: f_serial: remove compatibility layer

There are no old function interface users left, so the old interface
can be removed.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index 465789bd5c91..49c3d146f9b0 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -258,50 +258,6 @@ fail:
 	return status;
 }
 
-#ifdef USB_FSERIAL_INCLUDED
-
-static void
-gser_old_unbind(struct usb_configuration *c, struct usb_function *f)
-{
-	usb_free_all_descriptors(f);
-	kfree(func_to_gser(f));
-}
-
-/**
- * gser_bind_config - add a generic serial function to a configuration
- * @c: the configuration to support the serial instance
- * @port_num: /dev/ttyGS* port this interface will use
- * Context: single threaded during gadget setup
- *
- * Returns zero on success, else negative errno.
- */
-int __init gser_bind_config(struct usb_configuration *c, u8 port_num)
-{
-	struct f_gser	*gser;
-	int		status;
-
-	/* allocate and initialize one new instance */
-	gser = kzalloc(sizeof *gser, GFP_KERNEL);
-	if (!gser)
-		return -ENOMEM;
-
-	gser->port_num = port_num;
-
-	gser->port.func.name = "gser";
-	gser->port.func.strings = gser_strings;
-	gser->port.func.bind = gser_bind;
-	gser->port.func.unbind = gser_old_unbind;
-	gser->port.func.set_alt = gser_set_alt;
-	gser->port.func.disable = gser_disable;
-
-	status = usb_add_function(c, &gser->port.func);
-	if (status)
-		kfree(gser);
-	return status;
-}
-
-#else
-
 static void gser_free_inst(struct usb_function_instance *f)
 {
 	struct f_serial_opts *opts;
@@ -372,5 +328,3 @@ DECLARE_USB_FUNCTION_INIT(gser, gser_alloc_inst, gser_alloc);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Al Borchers");
 MODULE_AUTHOR("David Brownell");
-
-#endif