From: Pawel Laszczak <pawell@cadence.com>
To: <devicetree@vger.kernel.org>
Cc: <gregkh@linuxfoundation.org>, <felipe.balbi@linux.intel.com>,
<linux-usb@vger.kernel.org>, <hdegoede@redhat.com>,
<heikki.krogerus@linux.intel.com>, <robh+dt@kernel.org>,
<rogerq@ti.com>, <linux-kernel@vger.kernel.org>,
<jbergsagel@ti.com>, <nsekhar@ti.com>, <nm@ti.com>,
<sureshp@cadence.com>, <peter.chen@nxp.com>, <jpawar@cadence.com>,
<kurahul@cadence.com>, Pawel Laszczak <pawell@cadence.com>
Subject: [PATCH v9 3/6] usb:gadget Patch simplify usb_decode_set_clear_feature function.
Date: Fri, 5 Jul 2019 11:57:15 +0100 [thread overview]
Message-ID: <1562324238-16655-4-git-send-email-pawell@cadence.com> (raw)
In-Reply-To: <1562324238-16655-1-git-send-email-pawell@cadence.com>
Patch adds usb_decode_test_mode and usb_decode_device_feature functions,
which allow to make more readable and simplify the
usb_decode_set_clear_feature function.
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
---
drivers/usb/common/debug.c | 89 ++++++++++++++++++--------------------
1 file changed, 43 insertions(+), 46 deletions(-)
diff --git a/drivers/usb/common/debug.c b/drivers/usb/common/debug.c
index d5a469bc67a3..60a9f70a0904 100644
--- a/drivers/usb/common/debug.c
+++ b/drivers/usb/common/debug.c
@@ -30,58 +30,55 @@ static void usb_decode_get_status(__u8 bRequestType, __u16 wIndex,
}
}
-static void usb_decode_set_clear_feature(__u8 bRequestType, __u8 bRequest,
- __u16 wValue, __u16 wIndex,
- char *str, size_t size)
+static const char *usb_decode_device_feature(u16 wValue)
+{
+ switch (wValue) {
+ case USB_DEVICE_SELF_POWERED:
+ return "Self Powered";
+ case USB_DEVICE_REMOTE_WAKEUP:
+ return "Remote Wakeup";
+ case USB_DEVICE_TEST_MODE:
+ return "Test Mode";
+ case USB_DEVICE_U1_ENABLE:
+ return "U1 Enable";
+ case USB_DEVICE_U2_ENABLE:
+ return "U2 Enable";
+ case USB_DEVICE_LTM_ENABLE:
+ return "LTM Enable";
+ default:
+ return "UNKNOWN";
+ }
+}
+
+static const char *usb_decode_test_mode(u16 wIndex)
+{
+ switch (wIndex) {
+ case TEST_J:
+ return ": TEST_J";
+ case TEST_K:
+ return ": TEST_K";
+ case TEST_SE0_NAK:
+ return ": TEST_SE0_NAK";
+ case TEST_PACKET:
+ return ": TEST_PACKET";
+ case TEST_FORCE_EN:
+ return ": TEST_FORCE_EN";
+ default:
+ return ": UNKNOWN";
+ }
+}
+
+static void usb_decode_set_clear_feature(__u8 bRequestType,
+ __u8 bRequest, __u16 wValue,
+ __u16 wIndex, char *str, size_t size)
{
switch (bRequestType & USB_RECIP_MASK) {
case USB_RECIP_DEVICE:
snprintf(str, size, "%s Device Feature(%s%s)",
bRequest == USB_REQ_CLEAR_FEATURE ? "Clear" : "Set",
- ({char *s;
- switch (wValue) {
- case USB_DEVICE_SELF_POWERED:
- s = "Self Powered";
- break;
- case USB_DEVICE_REMOTE_WAKEUP:
- s = "Remote Wakeup";
- break;
- case USB_DEVICE_TEST_MODE:
- s = "Test Mode";
- break;
- case USB_DEVICE_U1_ENABLE:
- s = "U1 Enable";
- break;
- case USB_DEVICE_U2_ENABLE:
- s = "U2 Enable";
- break;
- case USB_DEVICE_LTM_ENABLE:
- s = "LTM Enable";
- break;
- default:
- s = "UNKNOWN";
- } s; }),
+ usb_decode_device_feature(wValue),
wValue == USB_DEVICE_TEST_MODE ?
- ({ char *s;
- switch (wIndex) {
- case TEST_J:
- s = ": TEST_J";
- break;
- case TEST_K:
- s = ": TEST_K";
- break;
- case TEST_SE0_NAK:
- s = ": TEST_SE0_NAK";
- break;
- case TEST_PACKET:
- s = ": TEST_PACKET";
- break;
- case TEST_FORCE_EN:
- s = ": TEST_FORCE_EN";
- break;
- default:
- s = ": UNKNOWN";
- } s; }) : "");
+ usb_decode_test_mode(wIndex) : "");
break;
case USB_RECIP_INTERFACE:
snprintf(str, size, "%s Interface Feature(%s)",
--
2.17.1
next prev parent reply other threads:[~2019-07-05 11:00 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 10:57 [PATCH v9 0/6] Introduced new Cadence USBSS DRD Driver Pawel Laszczak
2019-07-05 10:57 ` [PATCH v9 1/6] dt-bindings: add binding for USBSS-DRD controller Pawel Laszczak
2019-07-05 10:57 ` [PATCH v9 2/6] usb:gadget Separated decoding functions from dwc3 driver Pawel Laszczak
2019-07-05 11:27 ` Greg KH
2019-07-05 11:39 ` Pawel Laszczak
2019-07-05 11:49 ` Greg KH
2019-07-05 12:03 ` Pawel Laszczak
2019-07-05 11:39 ` Felipe Balbi
2019-07-05 11:44 ` Pawel Laszczak
2019-08-07 10:17 ` Roger Quadros
2019-08-07 10:22 ` Felipe Balbi
2019-08-08 3:07 ` Pawel Laszczak
2019-07-05 10:57 ` Pawel Laszczak [this message]
2019-07-05 10:57 ` [PATCH v9 4/6] usb:gadget Simplify usb_decode_get_set_descriptor function Pawel Laszczak
2019-07-05 10:57 ` [PATCH v9 5/6] usb:cdns3 Add Cadence USB3 DRD Driver Pawel Laszczak
2019-07-05 11:55 ` Felipe Balbi
2019-07-07 17:56 ` Pawel Laszczak
2019-07-08 6:29 ` Felipe Balbi
2019-07-08 10:59 ` Pawel Laszczak
2019-07-08 11:15 ` Felipe Balbi
2019-07-08 11:45 ` Pawel Laszczak
2019-07-08 11:59 ` Felipe Balbi
2019-07-08 12:39 ` Pawel Laszczak
2019-07-09 4:23 ` Pawel Laszczak
2019-07-09 6:36 ` Felipe Balbi
2019-07-09 7:07 ` Pawel Laszczak
2019-07-09 7:22 ` Felipe Balbi
2019-07-09 7:29 ` Pawel Laszczak
2019-07-10 8:25 ` Pawel Laszczak
2019-07-08 7:11 ` Felipe Balbi
2019-07-15 11:00 ` Pawel Laszczak
2019-08-07 10:34 ` Felipe Balbi
2019-08-10 20:39 ` Pawel Laszczak
2019-08-12 1:55 ` Peter Chen
2019-08-12 4:43 ` Pawel Laszczak
2019-08-12 5:24 ` Felipe Balbi
2019-08-12 7:13 ` Pawel Laszczak
2019-08-12 8:19 ` Felipe Balbi
2019-08-12 9:13 ` Pawel Laszczak
2019-08-12 9:45 ` Felipe Balbi
2019-08-12 10:26 ` Pawel Laszczak
2019-08-12 10:34 ` Felipe Balbi
2019-08-12 14:20 ` Alan Stern
2019-07-05 10:57 ` [PATCH v9 6/6] usb:cdns3 Fix for stuck packets in on-chip OUT buffer Pawel Laszczak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562324238-16655-4-git-send-email-pawell@cadence.com \
--to=pawell@cadence.com \
--cc=devicetree@vger.kernel.org \
--cc=felipe.balbi@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=jbergsagel@ti.com \
--cc=jpawar@cadence.com \
--cc=kurahul@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nm@ti.com \
--cc=nsekhar@ti.com \
--cc=peter.chen@nxp.com \
--cc=robh+dt@kernel.org \
--cc=rogerq@ti.com \
--cc=sureshp@cadence.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).