These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / gadget / function / f_hid.c

diff --git a/kernel/drivers/usb/gadget/function/f_hid.c b/kernel/drivers/usb/gadget/function/f_hid.c
index f7f35a3..99285b4 100644 (file)
--- a/kernel/drivers/usb/gadget/function/f_hid.c
+++ b/kernel/drivers/usb/gadget/function/f_hid.c
@@ -492,10 +492,7 @@ static void hidg_disable(struct usb_function *f)
        struct f_hidg_req_list *list, *next;
 
        usb_ep_disable(hidg->in_ep);
-       hidg->in_ep->driver_data = NULL;
-
        usb_ep_disable(hidg->out_ep);
-       hidg->out_ep->driver_data = NULL;
 
        list_for_each_entry_safe(list, next, &hidg->completed_out_req, list) {
                list_del(&list->list);
@@ -513,8 +510,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
        if (hidg->in_ep != NULL) {
                /* restart endpoint */
-               if (hidg->in_ep->driver_data != NULL)
-                       usb_ep_disable(hidg->in_ep);
+               usb_ep_disable(hidg->in_ep);
 
                status = config_ep_by_speed(f->config->cdev->gadget, f,
                                            hidg->in_ep);
@@ -533,8 +529,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
        if (hidg->out_ep != NULL) {
                /* restart endpoint */
-               if (hidg->out_ep->driver_data != NULL)
-                       usb_ep_disable(hidg->out_ep);
+               usb_ep_disable(hidg->out_ep);
 
                status = config_ep_by_speed(f->config->cdev->gadget, f,
                                            hidg->out_ep);
@@ -566,7 +561,6 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                                                hidg->out_ep->name, status);
                        } else {
                                usb_ep_disable(hidg->out_ep);
-                               hidg->out_ep->driver_data = NULL;
                                status = -ENOMEM;
                                goto fail;
                        }
@@ -614,13 +608,11 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
        ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_in_ep_desc);
        if (!ep)
                goto fail;
-       ep->driver_data = c->cdev;      /* claim */
        hidg->in_ep = ep;
 
        ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_out_ep_desc);
        if (!ep)
                goto fail;
-       ep->driver_data = c->cdev;      /* claim */
        hidg->out_ep = ep;
 
        /* preallocate request and buffer */
@@ -699,6 +691,10 @@ static inline int hidg_get_minor(void)
        int ret;
 
        ret = ida_simple_get(&hidg_ida, 0, 0, GFP_KERNEL);
+       if (ret >= HIDG_MINORS) {
+               ida_simple_remove(&hidg_ida, ret);
+               ret = -ENODEV;
+       }
 
        return ret;
 }
@@ -709,9 +705,6 @@ static inline struct f_hid_opts *to_f_hid_opts(struct config_item *item)
                            func_inst.group);
 }
 
-CONFIGFS_ATTR_STRUCT(f_hid_opts);
-CONFIGFS_ATTR_OPS(f_hid_opts);
-
 static void hid_attr_release(struct config_item *item)
 {
        struct f_hid_opts *opts = to_f_hid_opts(item);
@@ -721,13 +714,12 @@ static void hid_attr_release(struct config_item *item)
 
 static struct configfs_item_operations hidg_item_ops = {
        .release        = hid_attr_release,
-       .show_attribute = f_hid_opts_attr_show,
-       .store_attribute = f_hid_opts_attr_store,
 };
 
 #define F_HID_OPT(name, prec, limit)                                   \
-static ssize_t f_hid_opts_##name##_show(struct f_hid_opts *opts, char *page)\
+static ssize_t f_hid_opts_##name##_show(struct config_item *item, char *page)\
 {                                                                      \
+       struct f_hid_opts *opts = to_f_hid_opts(item);                  \
        int result;                                                     \
                                                                        \
        mutex_lock(&opts->lock);                                        \
@@ -737,9 +729,10 @@ static ssize_t f_hid_opts_##name##_show(struct f_hid_opts *opts, char *page)\
        return result;                                                  \
 }                                                                      \
                                                                        \
-static ssize_t f_hid_opts_##name##_store(struct f_hid_opts *opts,      \
+static ssize_t f_hid_opts_##name##_store(struct config_item *item,     \
                                         const char *page, size_t len)  \
 {                                                                      \
+       struct f_hid_opts *opts = to_f_hid_opts(item);                  \
        int ret;                                                        \
        u##prec num;                                                    \
                                                                        \
@@ -765,16 +758,15 @@ end:                                                                      \
        return ret;                                                     \
 }                                                                      \
                                                                        \
-static struct f_hid_opts_attribute f_hid_opts_##name =                 \
-       __CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR, f_hid_opts_##name##_show,\
-                       f_hid_opts_##name##_store)
+CONFIGFS_ATTR(f_hid_opts_, name)
 
 F_HID_OPT(subclass, 8, 255);
 F_HID_OPT(protocol, 8, 255);
 F_HID_OPT(report_length, 16, 65535);
 
-static ssize_t f_hid_opts_report_desc_show(struct f_hid_opts *opts, char *page)
+static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page)
 {
+       struct f_hid_opts *opts = to_f_hid_opts(item);
        int result;
 
        mutex_lock(&opts->lock);
@@ -785,9 +777,10 @@ static ssize_t f_hid_opts_report_desc_show(struct f_hid_opts *opts, char *page)
        return result;
 }
 
-static ssize_t f_hid_opts_report_desc_store(struct f_hid_opts *opts,
+static ssize_t f_hid_opts_report_desc_store(struct config_item *item,
                                            const char *page, size_t len)
 {
+       struct f_hid_opts *opts = to_f_hid_opts(item);
        int ret = -EBUSY;
        char *d;
 
@@ -814,16 +807,13 @@ end:
        return ret;
 }
 
-static struct f_hid_opts_attribute f_hid_opts_report_desc =
-       __CONFIGFS_ATTR(report_desc, S_IRUGO | S_IWUSR,
-                       f_hid_opts_report_desc_show,
-                       f_hid_opts_report_desc_store);
+CONFIGFS_ATTR(f_hid_opts_, report_desc);
 
 static struct configfs_attribute *hid_attrs[] = {
-       &f_hid_opts_subclass.attr,
-       &f_hid_opts_protocol.attr,
-       &f_hid_opts_report_length.attr,
-       &f_hid_opts_report_desc.attr,
+       &f_hid_opts_attr_subclass,
+       &f_hid_opts_attr_protocol,
+       &f_hid_opts_attr_report_length,
+       &f_hid_opts_attr_report_desc,
        NULL,
 };