Commit e5ee93d4 authored by Felipe Balbi's avatar Felipe Balbi

usb: dwc3: meson: fix checkpatch errors and warnings

no functional changes.
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 27c7ab0f
...@@ -116,11 +116,11 @@ static struct clk_bulk_data meson_a1_clocks[] = { ...@@ -116,11 +116,11 @@ static struct clk_bulk_data meson_a1_clocks[] = {
{ .id = "xtal_usb_ctrl" }, { .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", "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", "usb2-phy0", "usb2-phy1", "usb3-phy0",
}; };
...@@ -132,7 +132,7 @@ static const char *meson_g12a_phy_names[] = { ...@@ -132,7 +132,7 @@ static const char *meson_g12a_phy_names[] = {
* correctly when only the "usb2-phy1" phy is specified on-par with the * correctly when only the "usb2-phy1" phy is specified on-par with the
* DT bindings. * DT bindings.
*/ */
static const char *meson_a1_phy_names[] = { static const char * const meson_a1_phy_names[] = {
"usb2-phy0", "usb2-phy1" "usb2-phy0", "usb2-phy1"
}; };
...@@ -143,7 +143,7 @@ struct dwc3_meson_g12a_drvdata { ...@@ -143,7 +143,7 @@ struct dwc3_meson_g12a_drvdata {
bool otg_phy_host_port_disable; bool otg_phy_host_port_disable;
struct clk_bulk_data *clks; struct clk_bulk_data *clks;
int num_clks; int num_clks;
const char **phy_names; const char * const *phy_names;
int num_phys; int num_phys;
int (*setup_regmaps)(struct dwc3_meson_g12a *priv, void __iomem *base); int (*setup_regmaps)(struct dwc3_meson_g12a *priv, void __iomem *base);
int (*usb2_init_phy)(struct dwc3_meson_g12a *priv, int i, 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, ...@@ -520,11 +520,7 @@ static int dwc3_meson_g12a_role_set(struct usb_role_switch *sw,
return 0; return 0;
if (priv->drvdata->otg_phy_host_port_disable) if (priv->drvdata->otg_phy_host_port_disable)
dev_warn_once(priv->dev, "Manual OTG switch is broken on this "\ dev_warn_once(priv->dev, "Broken manual OTG switch\n");
"SoC, when manual switching from "\
"Host to device, DWC3 controller "\
"will need to be resetted in order "\
"to recover usage of the Host port");
return dwc3_meson_g12a_otg_mode_set(priv, mode); return dwc3_meson_g12a_otg_mode_set(priv, mode);
} }
...@@ -903,8 +899,8 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev) ...@@ -903,8 +899,8 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev)
return ret; return ret;
} }
if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) { if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) {
ret = regulator_enable(priv->vbus); ret = regulator_enable(priv->vbus);
if (ret) if (ret)
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment