From fa0a263bab5ff52db685ef8df8dfda88bc00e2d1 Mon Sep 17 00:00:00 2001 From: Kisang Lee Date: Wed, 13 Feb 2019 13:10:21 +0900 Subject: [PATCH] [RAMEN9610-12100][COMMON] usb: gadget: remove unnecessary delay in functionfs bind Change-Id: I8bb6d6c26e505abbc8fe1fc493983d71410459cf Signed-off-by: Kisang Lee --- drivers/usb/gadget/function/f_fs.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index f4f5e5af360e..2364b1cc6b60 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -34,7 +34,6 @@ #include #include #include -#include #include "u_fs.h" #include "u_f.h" @@ -2920,7 +2919,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f, struct f_fs_opts *ffs_opts = container_of(f->fi, struct f_fs_opts, func_inst); int ret; - int retries = 500; ENTER(); @@ -2931,24 +2929,17 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f, * * Configfs-enabled gadgets however do need ffs_dev_lock. */ - do { - if (!ffs_opts->no_configfs) - ffs_dev_lock(); - ret = ffs_opts->dev->desc_ready ? 0 : -ENODEV; - func->ffs = ffs_opts->dev->ffs_data; - if (!ffs_opts->no_configfs) - ffs_dev_unlock(); - if (ret) - msleep(20); - else - break; - } while (--retries); - - pr_info("ffs_do_functionfs_bind %d %d\n", ret, retries); - + if (!ffs_opts->no_configfs) + ffs_dev_lock(); + ret = ffs_opts->dev->desc_ready ? 0 : -ENODEV; + func->ffs = ffs_opts->dev->ffs_data; + if (!ffs_opts->no_configfs) + ffs_dev_unlock(); if (ret) return ERR_PTR(ret); + pr_info("KS : No waiting!!!\n"); + func->conf = c; func->gadget = c->cdev->gadget; -- 2.20.1