usb: gadget: f_rndis: 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>

2 files changed, 1 insertions, 107 deletions

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 717ed7f95639..9d7c99526dda 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -675,7 +675,6 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
         int                     status;
         struct usb_ep           *ep;
 
-#ifndef USB_FRNDIS_INCLUDED
         struct f_rndis_opts *rndis_opts;
 
         if (!can_support_rndis(c))
@@ -697,7 +696,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                         return status;
                 rndis_opts->bound = true;
         }
-#endif
+
         us = usb_gstrings_attach(cdev, rndis_strings,
                                  ARRAY_SIZE(rndis_string_defs));
         if (IS_ERR(us))
@@ -782,13 +781,6 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
         rndis->port.open = rndis_open;
         rndis->port.close = rndis_close;
 
-#ifdef USB_FRNDIS_INCLUDED
-        status = rndis_register(rndis_response_available, rndis);
-        if (status < 0)
-                goto fail;
-        rndis->config = status;
-#endif
-
         rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3, 0);
         rndis_set_host_mac(rndis->config, rndis->ethaddr);
 
@@ -830,66 +822,6 @@ fail:
         return status;
 }
 
-#ifdef USB_FRNDIS_INCLUDED
-
-static void
-rndis_old_unbind(struct usb_configuration *c, struct usb_function *f)
-{
-        struct f_rndis          *rndis = func_to_rndis(f);
-
-        rndis_deregister(rndis->config);
-
-        usb_free_all_descriptors(f);
-
-        kfree(rndis->notify_req->buf);
-        usb_ep_free_request(rndis->notify, rndis->notify_req);
-
-        kfree(rndis);
-}
-
-int
-rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
-                u32 vendorID, const char *manufacturer, struct eth_dev *dev)
-{
-        struct f_rndis  *rndis;
-        int             status;
-
-        /* allocate and initialize one new instance */
-        status = -ENOMEM;
-        rndis = kzalloc(sizeof *rndis, GFP_KERNEL);
-        if (!rndis)
-                goto fail;
-
-        memcpy(rndis->ethaddr, ethaddr, ETH_ALEN);
-        rndis->vendorID = vendorID;
-        rndis->manufacturer = manufacturer;
-
-        rndis->port.ioport = dev;
-        /* RNDIS activates when the host changes this filter */
-        rndis->port.cdc_filter = 0;
-
-        /* RNDIS has special (and complex) framing */
-        rndis->port.header_len = sizeof(struct rndis_packet_msg_type);
-        rndis->port.wrap = rndis_add_header;
-        rndis->port.unwrap = rndis_rm_hdr;
-
-        rndis->port.func.name = "rndis";
-        /* descriptors are per-instance copies */
-        rndis->port.func.bind = rndis_bind;
-        rndis->port.func.unbind = rndis_old_unbind;
-        rndis->port.func.set_alt = rndis_set_alt;
-        rndis->port.func.setup = rndis_setup;
-        rndis->port.func.disable = rndis_disable;
-
-        status = usb_add_function(c, &rndis->port.func);
-        if (status)
-                kfree(rndis);
-fail:
-        return status;
-}
-
-#else
-
 void rndis_borrow_net(struct usb_function_instance *f, struct net_device *net)
 {
         struct f_rndis_opts *opts;
@@ -1050,5 +982,3 @@ static struct usb_function *rndis_alloc(struct usb_function_instance *fi)
 DECLARE_USB_FUNCTION_INIT(rndis, rndis_alloc_inst, rndis_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 72b6facde40d..0f0290acea7e 100644
--- a/drivers/usb/gadget/u_ether.h
+++ b/drivers/usb/gadget/u_ether.h
@@ -267,40 +267,4 @@ static inline bool can_support_ecm(struct usb_gadget *gadget)
         return true;
 }
 
-/* each configuration may bind one instance of an ethernet link */
-#ifdef USB_ETH_RNDIS
-
-int rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
-                u32 vendorID, const char *manufacturer, struct eth_dev *dev);
-
-#else
-
-static inline int
-rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
-                u32 vendorID, const char *manufacturer, struct eth_dev *dev)
-{
-        return 0;
-}
-
-#endif
-
-/**
- * rndis_bind_config - add RNDIS 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
- * 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.
- */
-static inline int rndis_bind_config(struct usb_configuration *c,
-                u8 ethaddr[ETH_ALEN], struct eth_dev *dev)
-{
-        return rndis_bind_config_vendor(c, ethaddr, 0, NULL, dev);
-}
-
-
 #endif /* __U_ETHER_H */