From: balbi@kernel.org
To: Linux USB <linux-usb@vger.kernel.org>
Cc: Felipe Balbi <balbi@kernel.org>
Subject: [PATCH 03/11] dwc3: meson: fix checkpatch errors and warnings
Date: Thu, 13 Aug 2020 09:25:24 +0300 [thread overview]
Message-ID: <20200813062532.829720-3-balbi@kernel.org> (raw)
In-Reply-To: <20200813062532.829720-1-balbi@kernel.org>
From: Felipe Balbi <balbi@kernel.org>
no functional changes.
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 9c50a8f2929e..6522187a40cf 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -116,11 +116,11 @@ static struct clk_bulk_data meson_a1_clocks[] = {
{ .id = "xtal_usb_ctrl" },
};
-static const char *meson_gxm_phy_names[] = {
+static const char * const meson_gxm_phy_names[] = {
"usb2-phy0", "usb2-phy1", "usb2-phy2",
};
-static const char *meson_g12a_phy_names[] = {
+static const char * const meson_g12a_phy_names[] = {
"usb2-phy0", "usb2-phy1", "usb3-phy0",
};
@@ -132,7 +132,7 @@ static const char *meson_g12a_phy_names[] = {
* correctly when only the "usb2-phy1" phy is specified on-par with the
* DT bindings.
*/
-static const char *meson_a1_phy_names[] = {
+static const char * const meson_a1_phy_names[] = {
"usb2-phy0", "usb2-phy1"
};
@@ -143,7 +143,7 @@ struct dwc3_meson_g12a_drvdata {
bool otg_phy_host_port_disable;
struct clk_bulk_data *clks;
int num_clks;
- const char **phy_names;
+ const char * const *phy_names;
int num_phys;
int (*setup_regmaps)(struct dwc3_meson_g12a *priv, void __iomem *base);
int (*usb2_init_phy)(struct dwc3_meson_g12a *priv, int i,
@@ -520,11 +520,7 @@ static int dwc3_meson_g12a_role_set(struct usb_role_switch *sw,
return 0;
if (priv->drvdata->otg_phy_host_port_disable)
- dev_warn_once(priv->dev, "Manual OTG switch is broken on this "\
- "SoC, when manual switching from "\
- "Host to device, DWC3 controller "\
- "will need to be resetted in order "\
- "to recover usage of the Host port");
+ dev_warn_once(priv->dev, "Broken manual OTG switch\n");
return dwc3_meson_g12a_otg_mode_set(priv, mode);
}
@@ -906,8 +902,8 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev)
return ret;
}
- if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) {
- ret = regulator_enable(priv->vbus);
+ if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) {
+ ret = regulator_enable(priv->vbus);
if (ret)
return ret;
}
--
2.28.0
next prev parent reply other threads:[~2020-08-13 6:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
2020-08-13 6:25 ` [PATCH 02/11] dwc3: debug: fix sparse warning balbi
2020-08-13 6:25 ` balbi [this message]
2020-08-13 6:25 ` [PATCH 04/11] dwc3: ulpi: fix checkpatch warning balbi
2020-08-13 6:25 ` [PATCH 05/11] dwc3: trace: fix checkpatch warnings balbi
2020-08-13 6:25 ` [PATCH 06/11] dwc3: debug: fix checkpatch warning balbi
2020-08-13 6:25 ` [PATCH 07/11] dwc3: core: fix checkpatch warnings balbi
2020-08-13 6:25 ` [PATCH 08/11] dwc3: gadget: " balbi
2020-08-13 6:25 ` [PATCH 09/11] dwc3: ep0: " balbi
2020-08-13 6:25 ` [PATCH 10/11] dwc3: qcom: " balbi
2020-08-13 6:25 ` [PATCH 11/11] dwc3: debugfs: " balbi
2020-08-13 19:14 ` Thinh Nguyen
2020-08-14 5:12 ` Felipe Balbi
2020-08-14 5:36 ` Thinh Nguyen
2020-08-14 6:16 ` Thinh Nguyen
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=20200813062532.829720-3-balbi@kernel.org \
--to=balbi@kernel.org \
--cc=linux-usb@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.