summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2013-03-14 15:14:26 (GMT)
committerFelipe Balbi <balbi@ti.com>2013-04-03 11:43:34 (GMT)
commit9786b4561228099f579ad88912aa305812526ea1 (patch)
tree3ab0c0c61ffd906ec432756bf30190ec227e899c
parent70cc3c024640a3c60e91d04789f9574a371a2db5 (diff)
downloadlinux-fsl-qoriq-9786b4561228099f579ad88912aa305812526ea1.tar.xz
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>
-rw-r--r--drivers/usb/gadget/f_serial.c46
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index 465789b..49c3d14 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