usb: gadget: printer: move function-related unbind code to function's unbind

In order to factor out a reusable f_printer.c, the code related to the
function should be placed in functions related to the function.

printer_cfg_unbind() becomes empty, so it is removed.

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

diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
index 5dbb93a91512b4a15a0e64ebe19600b2f53b999e..84e6cdd72137e0059190a048a5a302b7b21d9faf 100644 (file)
--- a/drivers/usb/gadget/legacy/printer.c
+++ b/drivers/usb/gadget/legacy/printer.c
@@ -1155,44 +1155,12 @@ fail_tx_reqs:
 
 static void printer_func_unbind(struct usb_configuration *c,
                struct usb_function *f)
-{
-       usb_free_all_descriptors(f);
-}
-
-static int printer_func_set_alt(struct usb_function *f,
-               unsigned intf, unsigned alt)
-{
-       struct printer_dev *dev = container_of(f, struct printer_dev, function);
-       int ret = -ENOTSUPP;
-
-       if (!alt)
-               ret = set_interface(dev, intf);
-
-       return ret;
-}
-
-static void printer_func_disable(struct usb_function *f)
-{
-       struct printer_dev *dev = container_of(f, struct printer_dev, function);
-       unsigned long           flags;
-
-       DBG(dev, "%s\n", __func__);
-
-       spin_lock_irqsave(&dev->lock, flags);
-       printer_reset_interface(dev);
-       spin_unlock_irqrestore(&dev->lock, flags);
-}
-
-static void printer_cfg_unbind(struct usb_configuration *c)
 {
        struct printer_dev      *dev;
        struct usb_request      *req;
 
        dev = &usb_printer_gadget;
 
-       DBG(dev, "%s\n", __func__);
-
-       /* Remove sysfs files */
        device_destroy(usb_gadget_class, g_printer_devno);
 
        /* Remove Character Device */
@@ -1226,11 +1194,35 @@ static void printer_cfg_unbind(struct usb_configuration *c)
                list_del(&req->list);
                printer_req_free(dev->out_ep, req);
        }
+       usb_free_all_descriptors(f);
+}
+
+static int printer_func_set_alt(struct usb_function *f,
+               unsigned intf, unsigned alt)
+{
+       struct printer_dev *dev = container_of(f, struct printer_dev, function);
+       int ret = -ENOTSUPP;
+
+       if (!alt)
+               ret = set_interface(dev, intf);
+
+       return ret;
+}
+
+static void printer_func_disable(struct usb_function *f)
+{
+       struct printer_dev *dev = container_of(f, struct printer_dev, function);
+       unsigned long           flags;
+
+       DBG(dev, "%s\n", __func__);
+
+       spin_lock_irqsave(&dev->lock, flags);
+       printer_reset_interface(dev);
+       spin_unlock_irqrestore(&dev->lock, flags);
 }
 
 static struct usb_configuration printer_cfg_driver = {
        .label                  = "printer",
-       .unbind                 = printer_cfg_unbind,
        .bConfigurationValue    = 1,
        .bmAttributes           = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
 };