usb: gadget: remove max support speed info in bind operation

Take ecm_bind() for example, it call gadget_is_{*}speed() API to show
gadget max support speed, it is not much help, remove the API usage here
is safe.

Similar change apply to acm,eem,loopback,ncm,obex,rndis,serial,
sourcesink,subset functions.

Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230803091053.9714-8-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index cb523f118f041ca76cfa0e98e7c106ef2af3c41c..f616059c5e1e4cce15df371b14bb5963e131f776 100644 (file)
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -691,10 +691,8 @@ acm_bind(struct usb_configuration *c, struct usb_function *f)
                goto fail;
 
        dev_dbg(&cdev->gadget->dev,
-               "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n",
+               "acm ttyGS%d: IN/%s OUT/%s NOTIFY/%s\n",
                acm->port_num,
-               gadget_is_superspeed(c->cdev->gadget) ? "super" :
-               gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
                acm->port.in->name, acm->port.out->name,
                acm->notify->name);
        return 0;

diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 7e943b5623484d71a24b8e51221b2a765e35b29e..f55f60639e4251d6ee9ccd28faaeeac8104f353b 100644 (file)
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -788,9 +788,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
        ecm->port.open = ecm_open;
        ecm->port.close = ecm_close;
 
-       DBG(cdev, "CDC Ethernet: %s speed IN/%s OUT/%s NOTIFY/%s\n",
-                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+       DBG(cdev, "CDC Ethernet: IN/%s OUT/%s NOTIFY/%s\n",
                        ecm->port.in_ep->name, ecm->port.out_ep->name,
                        ecm->notify->name);
        return 0;

diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index 5d38f29bda720ed40ef9881251f568ad10352604..3b445bd884988ca92d54a50ee0991abd0949fc34 100644 (file)
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -311,9 +311,7 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f)
        if (status)
                goto fail;
 
-       DBG(cdev, "CDC Ethernet (EEM): %s speed IN/%s OUT/%s\n",
-                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+       DBG(cdev, "CDC Ethernet (EEM): IN/%s OUT/%s\n",
                        eem->port.in_ep->name, eem->port.out_ep->name);
        return 0;
 

diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index ae41f556eb752b8d4c1628a54cf4f96b1815bb8e..17ac6ace0cffa140e36681aec90d97745b6fc798 100644 (file)
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -211,9 +211,7 @@ autoconf_fail:
        if (ret)
                return ret;
 
-       DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",
-           (gadget_is_superspeed(c->cdev->gadget) ? "super" :
-            (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full")),
+       DBG(cdev, "%s: IN/%s, OUT/%s\n",
                        f->name, loop->in_ep->name, loop->out_ep->name);
        return 0;
 }

diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 0feadf686a31db4aff1b70baa473c32b8f61d4fd..feccf4c8cc4fb3d51640d74196347c643df9d0b6 100644 (file)
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1529,9 +1529,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f)
        hrtimer_init(&ncm->task_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
        ncm->task_timer.function = ncm_tx_timeout;
 
-       DBG(cdev, "CDC Network: %s speed IN/%s OUT/%s NOTIFY/%s\n",
-                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+       DBG(cdev, "CDC Network: IN/%s OUT/%s NOTIFY/%s\n",
                        ncm->port.in_ep->name, ncm->port.out_ep->name,
                        ncm->notify->name);
        return 0;

diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
index ab26d84ed95e6c5ec4317def3f6fbe2788324f0a..dcb093210305d8a942c1d1a5479d67554e9e4112 100644 (file)
--- a/drivers/usb/gadget/function/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -365,9 +365,8 @@ static int obex_bind(struct usb_configuration *c, struct usb_function *f)
        if (status)
                goto fail;
 
-       dev_dbg(&cdev->gadget->dev, "obex ttyGS%d: %s speed IN/%s OUT/%s\n",
+       dev_dbg(&cdev->gadget->dev, "obex ttyGS%d: IN/%s OUT/%s\n",
                obex->port_num,
-               gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
                obex->port.in->name, obex->port.out->name);
 
        return 0;

diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index ed1c3eb91d3b185846410db81a41a87ab8b20826..b47f99d17ee9a5682dfecfc7cb200d2a0e04c968 100644 (file)
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -798,9 +798,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
         * until we're activated via set_alt().
         */
 
-       DBG(cdev, "RNDIS: %s speed IN/%s OUT/%s NOTIFY/%s\n",
-                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+       DBG(cdev, "RNDIS: IN/%s OUT/%s NOTIFY/%s\n",
                        rndis->port.in_ep->name, rndis->port.out_ep->name,
                        rndis->notify->name);
        return 0;

diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index a9480b9e312e32ab9c8325bd90e2b686a02c134e..65c50092aea2d3314a138af89dacc3aa13098f0b 100644 (file)
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -236,10 +236,8 @@ static int gser_bind(struct usb_configuration *c, struct usb_function *f)
                        gser_ss_function, gser_ss_function);
        if (status)
                goto fail;
-       dev_dbg(&cdev->gadget->dev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",
+       dev_dbg(&cdev->gadget->dev, "generic ttyGS%d: IN/%s OUT/%s\n",
                gser->port_num,
-               gadget_is_superspeed(c->cdev->gadget) ? "super" :
-               gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
                gser->port.in->name, gser->port.out->name);
        return 0;
 

diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index 6803cd60cc6dc3147b1901c56cf28f9dda2da607..2edbd9b510d60293d56dd2fa680cd2eac0795092 100644 (file)
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -436,9 +436,7 @@ no_iso:
        if (ret)
                return ret;
 
-       DBG(cdev, "%s speed %s: IN/%s, OUT/%s, ISO-IN/%s, ISO-OUT/%s\n",
-           (gadget_is_superspeed(c->cdev->gadget) ? "super" :
-            (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full")),
+       DBG(cdev, "%s: IN/%s, OUT/%s, ISO-IN/%s, ISO-OUT/%s\n",
                        f->name, ss->in_ep->name, ss->out_ep->name,
                        ss->iso_in_ep ? ss->iso_in_ep->name : "<none>",
                        ss->iso_out_ep ? ss->iso_out_ep->name : "<none>");

diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 51c1cae162d9b0a4dc2e80c80a36db6dcc500e69..8ae9689ef2a0819f7e3805143fc73befb34d86be 100644 (file)
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -367,9 +367,7 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
         * until we're activated via set_alt().
         */
 
-       DBG(cdev, "CDC Subset: %s speed IN/%s OUT/%s\n",
-                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+       DBG(cdev, "CDC Subset: IN/%s OUT/%s\n",
                        geth->port.in_ep->name, geth->port.out_ep->name);
        return 0;