usb: gadget: f_tcm: remove redundant singleton

The only instance is guaranteed with TPG_INSTANCES defined to 1.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 33afe6ac0b6275f12ba47efb69675d3246da747a..b33738a8eea204311243d72069e0cd4aeda7e580 100644 (file)
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1371,8 +1371,6 @@ static int usbg_init_nodeacl(struct se_node_acl *se_nacl, const char *name)
        return 0;
 }
 
-struct usbg_tpg *the_only_tpg_I_currently_have;
-
 static struct se_portal_group *usbg_make_tpg(
        struct se_wwn *wwn,
        struct config_group *group,
@@ -1390,11 +1388,6 @@ static struct se_portal_group *usbg_make_tpg(
                return ERR_PTR(-EINVAL);
        if (kstrtoul(name + 5, 0, &tpgt) || tpgt > UINT_MAX)
                return ERR_PTR(-EINVAL);
-       if (the_only_tpg_I_currently_have) {
-               pr_err("Until the gadget framework can't handle multiple\n");
-               pr_err("gadgets, you can't do this here.\n");
-               return ERR_PTR(-EBUSY);
-       }
        ret = -ENODEV;
        mutex_lock(&tpg_instances_lock);
        for (i = 0; i < TPG_INSTANCES; ++i)
@@ -1437,7 +1430,6 @@ static struct se_portal_group *usbg_make_tpg(
        tpg->fi = tpg_instances[i].func_inst;
        mutex_unlock(&opts->dep_lock);
        mutex_unlock(&tpg_instances_lock);
-       the_only_tpg_I_currently_have = tpg;
        return &tpg->se_tpg;
 
 free_workqueue:
@@ -1481,7 +1473,6 @@ static void usbg_drop_tpg(struct se_portal_group *se_tpg)
        mutex_unlock(&tpg_instances_lock);
 
        kfree(tpg);
-       the_only_tpg_I_currently_have = NULL;
 }
 
 static struct se_wwn *usbg_make_tport(

diff --git a/drivers/usb/gadget/function/tcm.h b/drivers/usb/gadget/function/tcm.h
index 0b8ff6dc63ee2b251851fc19ced2529ca6f8fe76..b75c6f3e198055854dbc22dc45041f5125fe9173 100644 (file)
--- a/drivers/usb/gadget/function/tcm.h
+++ b/drivers/usb/gadget/function/tcm.h
@@ -129,6 +129,4 @@ struct f_uas {
        struct usb_request      *bot_req_out;
 };
 
-extern struct usbg_tpg *the_only_tpg_I_currently_have;
-
 #endif /* __TARGET_USB_GADGET_H__ */