From: "Ivan T. Ivanov" <[email protected]>
This fixes following:
WARNING: quoted string split across lines
WARNING: Prefer seq_puts to seq_printf
Signed-off-by: Ivan T. Ivanov <[email protected]>
---
drivers/usb/phy/phy-msm-usb.c | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 4045301..1629247 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -67,8 +67,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
USB_PHY_VDD_DIG_VOL_MIN,
USB_PHY_VDD_DIG_VOL_MAX);
if (ret) {
- dev_err(motg->phy.dev, "unable to set the voltage "
- "for hsusb vddcx\n");
+ dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
return ret;
}
@@ -79,8 +78,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
ret = regulator_set_voltage(motg->vddcx, 0,
USB_PHY_VDD_DIG_VOL_MAX);
if (ret)
- dev_err(motg->phy.dev, "unable to set the voltage "
- "for hsusb vddcx\n");
+ dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
ret = regulator_disable(motg->vddcx);
if (ret)
dev_err(motg->phy.dev, "unable to disable hsusb vddcx\n");
@@ -97,8 +95,7 @@ static int msm_hsusb_ldo_init(struct msm_otg *motg, int init)
rc = regulator_set_voltage(motg->v3p3, USB_PHY_3P3_VOL_MIN,
USB_PHY_3P3_VOL_MAX);
if (rc) {
- dev_err(motg->phy.dev, "unable to set voltage level "
- "for hsusb 3p3\n");
+ dev_err(motg->phy.dev, "Cannot set v3p3 voltage\n");
goto exit;
}
rc = regulator_enable(motg->v3p3);
@@ -109,8 +106,7 @@ static int msm_hsusb_ldo_init(struct msm_otg *motg, int init)
rc = regulator_set_voltage(motg->v1p8, USB_PHY_1P8_VOL_MIN,
USB_PHY_1P8_VOL_MAX);
if (rc) {
- dev_err(motg->phy.dev, "unable to set voltage level "
- "for hsusb 1p8\n");
+ dev_err(motg->phy.dev, "Cannot set v1p8 voltage\n");
goto disable_3p3;
}
rc = regulator_enable(motg->v1p8);
@@ -137,15 +133,13 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
ret = regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_HPM_LOAD);
if (ret < 0) {
- pr_err("%s: Unable to set HPM of the regulator "
- "HSUSB_1p8\n", __func__);
+ pr_err("Could not set HPM for v1p8\n");
return ret;
}
ret = regulator_set_optimum_mode(motg->v3p3,
USB_PHY_3P3_HPM_LOAD);
if (ret < 0) {
- pr_err("%s: Unable to set HPM of the regulator "
- "HSUSB_3p3\n", __func__);
+ pr_err("Could not set HPM for v3p3\n");
regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_LPM_LOAD);
return ret;
@@ -154,13 +148,11 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
ret = regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_LPM_LOAD);
if (ret < 0)
- pr_err("%s: Unable to set LPM of the regulator "
- "HSUSB_1p8\n", __func__);
+ pr_err("Could not set LPM for v1p8\n");
ret = regulator_set_optimum_mode(motg->v3p3,
USB_PHY_3P3_LPM_LOAD);
if (ret < 0)
- pr_err("%s: Unable to set LPM of the regulator "
- "HSUSB_3p3\n", __func__);
+ pr_err("Could not set LPM for v3p3\n");
}
pr_debug("reg (%s)\n", on ? "HPM" : "LPM");
@@ -390,8 +382,7 @@ static int msm_hsusb_config_vddcx(struct msm_otg *motg, int high)
ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
if (ret) {
- pr_err("%s: unable to set the voltage for regulator "
- "HSUSB_VDDCX\n", __func__);
+ dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
return ret;
}
@@ -546,8 +537,7 @@ static int msm_otg_resume(struct msm_otg *motg)
* PHY. USB state can not be restored. Re-insertion
* of USB cable is the only way to get USB working.
*/
- dev_err(phy->dev, "Unable to resume USB."
- "Re-plugin the cable\n");
+ dev_err(phy->dev, "Unable to resume USB. Re-plugin the cable\n");
msm_otg_reset(phy);
}
@@ -1242,13 +1232,13 @@ static int msm_otg_mode_show(struct seq_file *s, void *unused)
switch (otg->phy->state) {
case OTG_STATE_A_HOST:
- seq_printf(s, "host\n");
+ seq_puts(s, "host\n");
break;
case OTG_STATE_B_PERIPHERAL:
- seq_printf(s, "peripheral\n");
+ seq_puts(s, "peripheral\n");
break;
default:
- seq_printf(s, "none\n");
+ seq_puts(s, "none\n");
break;
}
@@ -1530,8 +1520,7 @@ static int msm_otg_probe(struct platform_device *pdev)
motg->pdata->otg_control == OTG_USER_CONTROL) {
ret = msm_otg_debugfs_init(motg);
if (ret)
- dev_dbg(&pdev->dev, "mode debugfs file is"
- "not available\n");
+ dev_dbg(&pdev->dev, "Can not create mode change file\n");
}
pm_runtime_set_active(&pdev->dev);
--
1.8.3.2
On 22/04/14 10:20, Ivan T. Ivanov wrote:
> @@ -79,8 +78,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
> ret = regulator_set_voltage(motg->vddcx, 0,
> USB_PHY_VDD_DIG_VOL_MAX);
> if (ret)
> - dev_err(motg->phy.dev, "unable to set the voltage "
> - "for hsusb vddcx\n");
> + dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
> @@ -137,15 +133,13 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
> ret = regulator_set_optimum_mode(motg->v1p8,
> USB_PHY_1P8_HPM_LOAD);
> if (ret < 0) {
> - pr_err("%s: Unable to set HPM of the regulator "
> - "HSUSB_1p8\n", __func__);
> + pr_err("Could not set HPM for v1p8\n");
> return ret;
> }
> @@ -390,8 +382,7 @@ static int msm_hsusb_config_vddcx(struct msm_otg *motg, int high)
>
> ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
> if (ret) {
> - pr_err("%s: unable to set the voltage for regulator "
> - "HSUSB_VDDCX\n", __func__);
> + dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
> return ret;
> }
>
I see some of pr_err not moved to dev_err?, while others have been moved.
Also noticed that the error messages are changed as part of this fix.
IMHO, changing an error message would have a side-effects on logging
tools, anyway Am not sure if its true in this case.
Thanks,
srini
On Tue, 2014-04-22 at 16:30 +0100, Srinivas Kandagatla wrote:
>
> On 22/04/14 10:20, Ivan T. Ivanov wrote:
> > @@ -79,8 +78,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
> > ret = regulator_set_voltage(motg->vddcx, 0,
> > USB_PHY_VDD_DIG_VOL_MAX);
> > if (ret)
> > - dev_err(motg->phy.dev, "unable to set the voltage "
> > - "for hsusb vddcx\n");
> > + dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
>
>
> > @@ -137,15 +133,13 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
> > ret = regulator_set_optimum_mode(motg->v1p8,
> > USB_PHY_1P8_HPM_LOAD);
> > if (ret < 0) {
> > - pr_err("%s: Unable to set HPM of the regulator "
> > - "HSUSB_1p8\n", __func__);
> > + pr_err("Could not set HPM for v1p8\n");
> > return ret;
> > }
>
>
> > @@ -390,8 +382,7 @@ static int msm_hsusb_config_vddcx(struct msm_otg *motg, int high)
> >
> > ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
> > if (ret) {
> > - pr_err("%s: unable to set the voltage for regulator "
> > - "HSUSB_VDDCX\n", __func__);
> > + dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
> > return ret;
> > }
> >
>
>
> I see some of pr_err not moved to dev_err?, while others have been moved.
Right, intention was to just shorten messages to fit one line, to make
checkpatch.pl happy.
Thanks,
Ivan
> Also noticed that the error messages are changed as part of this fix.
> IMHO, changing an error message would have a side-effects on logging
> tools, anyway Am not sure if its true in this case.
>
> Thanks,
> srini
> --