usb: gadget: f_subset: 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>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index 7c8674fa7e8094074aa794fe9407e2adeab7548a..f1a59190ac9a0b2ad002ca5a0ebcd3d9668126b6 100644 (file)
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -301,7 +301,6 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
        int                     status;
        struct usb_ep           *ep;
 
-#ifndef USB_FSUBSET_INCLUDED
        struct f_gether_opts    *gether_opts;
 
        gether_opts = container_of(f->fi, struct f_gether_opts, func_inst);
@@ -322,7 +321,7 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
                        return status;
                gether_opts->bound = true;
        }
-#endif
+
        us = usb_gstrings_attach(cdev, geth_strings,
                                 ARRAY_SIZE(geth_string_defs));
        if (IS_ERR(us))
@@ -393,61 +392,6 @@ fail:
        return status;
 }
 
-#ifdef USB_FSUBSET_INCLUDED
-
-static void
-geth_old_unbind(struct usb_configuration *c, struct usb_function *f)
-{
-       geth_string_defs[0].id = 0;
-       usb_free_all_descriptors(f);
-       kfree(func_to_geth(f));
-}
-
-/**
- * geth_bind_config - add CDC Subset network link to a configuration
- * @c: the configuration to support the network link
- * @ethaddr: a buffer in which the ethernet address of the host side
- *     side of the link was recorded
- * @dev: eth_dev structure
- * Context: single threaded during gadget setup
- *
- * Returns zero on success, else negative errno.
- *
- * Caller must have called @gether_setup().  Caller is also responsible
- * for calling @gether_cleanup() before module unload.
- */
-int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
-               struct eth_dev *dev)
-{
-       struct f_gether *geth;
-       int             status;
-
-       /* allocate and initialize one new instance */
-       geth = kzalloc(sizeof *geth, GFP_KERNEL);
-       if (!geth)
-               return -ENOMEM;
-
-       /* export host's Ethernet address in CDC format */
-       snprintf(geth->ethaddr, sizeof geth->ethaddr, "%pm", ethaddr);
-       geth_string_defs[1].s = geth->ethaddr;
-
-       geth->port.ioport = dev;
-       geth->port.cdc_filter = DEFAULT_FILTER;
-
-       geth->port.func.name = "cdc_subset";
-       geth->port.func.bind = geth_bind;
-       geth->port.func.unbind = geth_old_unbind;
-       geth->port.func.set_alt = geth_set_alt;
-       geth->port.func.disable = geth_disable;
-
-       status = usb_add_function(c, &geth->port.func);
-       if (status)
-               kfree(geth);
-       return status;
-}
-
-#else
-
 static inline struct f_gether_opts *to_f_gether_opts(struct config_item *item)
 {
        return container_of(to_config_group(item), struct f_gether_opts,
@@ -573,5 +517,3 @@ static struct usb_function *geth_alloc(struct usb_function_instance *fi)
 DECLARE_USB_FUNCTION_INIT(geth, geth_alloc_inst, geth_alloc);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Brownell");
-
-#endif

diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h
index c06059568d6c9afa39c0ad93644fe5430db68859..72b6facde40d24bad19e472de6076433ab1c87ac 100644 (file)
--- a/drivers/usb/gadget/u_ether.h
+++ b/drivers/usb/gadget/u_ether.h
@@ -268,9 +268,6 @@ static inline bool can_support_ecm(struct usb_gadget *gadget)
 }
 
 /* each configuration may bind one instance of an ethernet link */
-int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
-               struct eth_dev *dev);
-
 #ifdef USB_ETH_RNDIS
 
 int rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],