2021-05-25 10:30:28

by Chunfeng Yun

Subject: [PATCH 1/2] usb: roles: add helper usb_role_string()

Introduces usb_role_string() function, which returns a
human-readable name of provided usb role, it's useful to
make the log readable.

Signed-off-by: Chunfeng Yun <[email protected]>
---
drivers/usb/roles/class.c | 9 +++++++++
include/linux/usb/role.h | 6 ++++++
2 files changed, 15 insertions(+)

diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index 33b637d0d8d9..dfaed7eee94f 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -214,6 +214,15 @@ static const char * const usb_roles[] = {
[USB_ROLE_DEVICE] = "device",
};

+const char *usb_role_string(enum usb_role role)
+{
+ if (role < 0 || role >= ARRAY_SIZE(usb_roles))
+ return "unknown";
+
+ return usb_roles[role];
+}
+EXPORT_SYMBOL_GPL(usb_role_string);
+
static ssize_t
role_show(struct device *dev, struct device_attribute *attr, char *buf)
{
diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index 0164fed31b06..031f148ab373 100644
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -65,6 +65,7 @@ void usb_role_switch_unregister(struct usb_role_switch *sw);

void usb_role_switch_set_drvdata(struct usb_role_switch *sw, void *data);
void *usb_role_switch_get_drvdata(struct usb_role_switch *sw);
+const char *usb_role_string(enum usb_role role);
#else
static inline int usb_role_switch_set_role(struct usb_role_switch *sw,
enum usb_role role)
@@ -109,6 +110,11 @@ static inline void *usb_role_switch_get_drvdata(struct usb_role_switch *sw)
return NULL;
}

+static inline const char *usb_role_string(enum usb_role role)
+{
+ return "unknown";
+}
+
#endif

#endif /* __LINUX_USB_ROLE_H */
--
2.18.0

2021-05-25 10:30:30

by Chunfeng Yun

Subject: [PATCH 2/2] usb: common: usb-conn-gpio: use usb_role_string() to print role status

Use usb_role_string() to print role status, make the log readable.

Signed-off-by: Chunfeng Yun <[email protected]>
---
drivers/usb/common/usb-conn-gpio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
index 65d89140cd19..7dbe8baed029 100644
--- a/drivers/usb/common/usb-conn-gpio.c
+++ b/drivers/usb/common/usb-conn-gpio.c
@@ -83,11 +83,11 @@ static void usb_conn_detect_cable(struct work_struct *work)
else
role = USB_ROLE_NONE;

- dev_dbg(info->dev, "role %d/%d, gpios: id %d, vbus %d\n",
- info->last_role, role, id, vbus);
+ dev_dbg(info->dev, "role %s -> %s, gpios: id %d, vbus %d\n",
+ usb_role_string(info->last_role), usb_role_string(role), id, vbus);

if (info->last_role == role) {
- dev_warn(info->dev, "repeated role: %d\n", role);
+ dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role));
return;
}

--
2.18.0

2021-05-26 11:25:25

by Heikki Krogerus

Subject: Re: [PATCH 1/2] usb: roles: add helper usb_role_string()

On Tue, May 25, 2021 at 04:53:05PM +0800, Chunfeng Yun wrote:
> Introduces usb_role_string() function, which returns a
> human-readable name of provided usb role, it's useful to
> make the log readable.
>
> Signed-off-by: Chunfeng Yun <[email protected]>

Reviewed-by: Heikki Krogerus <[email protected]>

> ---
> drivers/usb/roles/class.c | 9 +++++++++
> include/linux/usb/role.h | 6 ++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
> index 33b637d0d8d9..dfaed7eee94f 100644
> --- a/drivers/usb/roles/class.c
> +++ b/drivers/usb/roles/class.c
> @@ -214,6 +214,15 @@ static const char * const usb_roles[] = {
> [USB_ROLE_DEVICE] = "device",
> };
>
> +const char *usb_role_string(enum usb_role role)
> +{
> + if (role < 0 || role >= ARRAY_SIZE(usb_roles))
> + return "unknown";
> +
> + return usb_roles[role];
> +}
> +EXPORT_SYMBOL_GPL(usb_role_string);
> +
> static ssize_t
> role_show(struct device *dev, struct device_attribute *attr, char *buf)
> {
> diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
> index 0164fed31b06..031f148ab373 100644
> --- a/include/linux/usb/role.h
> +++ b/include/linux/usb/role.h
> @@ -65,6 +65,7 @@ void usb_role_switch_unregister(struct usb_role_switch *sw);
>
> void usb_role_switch_set_drvdata(struct usb_role_switch *sw, void *data);
> void *usb_role_switch_get_drvdata(struct usb_role_switch *sw);
> +const char *usb_role_string(enum usb_role role);
> #else
> static inline int usb_role_switch_set_role(struct usb_role_switch *sw,
> enum usb_role role)
> @@ -109,6 +110,11 @@ static inline void *usb_role_switch_get_drvdata(struct usb_role_switch *sw)
> return NULL;
> }
>
> +static inline const char *usb_role_string(enum usb_role role)
> +{
> + return "unknown";
> +}
> +
> #endif
>
> #endif /* __LINUX_USB_ROLE_H */
> --
> 2.18.0

--
heikki