renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

usb: phy: msm: Fix checkpatch.pl warnings

Browse Source 
This fixes following:

WARNING: quoted string split across lines
WARNING: Prefer seq_puts to seq_printf

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Ivan T. Ivanov 2014-04-28 16:34:10 +03:00 committed by Felipe Balbi
parent f7ddad4742
commit 3aca0fa95f
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/usb/phy/phy-msm-usb.c
View File

@ -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_MIN,
USB_PHY_VDD_DIG_VOL_MAX); USB_PHY_VDD_DIG_VOL_MAX);
if (ret) { if (ret) {
dev_err(motg->phy.dev, "unable to set the voltage " dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
"for hsusb vddcx\n");
return ret; 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, ret = regulator_set_voltage(motg->vddcx, 0,
USB_PHY_VDD_DIG_VOL_MAX); USB_PHY_VDD_DIG_VOL_MAX);
if (ret) if (ret)
dev_err(motg->phy.dev, "unable to set the voltage " dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
"for hsusb vddcx\n");
ret = regulator_disable(motg->vddcx); ret = regulator_disable(motg->vddcx);
if (ret) if (ret)
dev_err(motg->phy.dev, "unable to disable hsusb vddcx\n"); 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, rc = regulator_set_voltage(motg->v3p3, USB_PHY_3P3_VOL_MIN,
USB_PHY_3P3_VOL_MAX); USB_PHY_3P3_VOL_MAX);
if (rc) { if (rc) {
dev_err(motg->phy.dev, "unable to set voltage level " dev_err(motg->phy.dev, "Cannot set v3p3 voltage\n");
"for hsusb 3p3\n");
goto exit; goto exit;
} }
rc = regulator_enable(motg->v3p3); 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, rc = regulator_set_voltage(motg->v1p8, USB_PHY_1P8_VOL_MIN,
USB_PHY_1P8_VOL_MAX); USB_PHY_1P8_VOL_MAX);
if (rc) { if (rc) {
dev_err(motg->phy.dev, "unable to set voltage level " dev_err(motg->phy.dev, "Cannot set v1p8 voltage\n");
"for hsusb 1p8\n");
goto disable_3p3; goto disable_3p3;
} }
rc = regulator_enable(motg->v1p8); 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, ret = regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_HPM_LOAD); USB_PHY_1P8_HPM_LOAD);
if (ret < 0) { if (ret < 0) {
pr_err("%s: Unable to set HPM of the regulator " pr_err("Could not set HPM for v1p8\n");
"HSUSB_1p8\n", __func__);
return ret; return ret;
} }
ret = regulator_set_optimum_mode(motg->v3p3, ret = regulator_set_optimum_mode(motg->v3p3,
USB_PHY_3P3_HPM_LOAD); USB_PHY_3P3_HPM_LOAD);
if (ret < 0) { if (ret < 0) {
pr_err("%s: Unable to set HPM of the regulator " pr_err("Could not set HPM for v3p3\n");
"HSUSB_3p3\n", __func__);
regulator_set_optimum_mode(motg->v1p8, regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_LPM_LOAD); USB_PHY_1P8_LPM_LOAD);
return ret; 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, ret = regulator_set_optimum_mode(motg->v1p8,
USB_PHY_1P8_LPM_LOAD); USB_PHY_1P8_LPM_LOAD);
if (ret < 0) if (ret < 0)
pr_err("%s: Unable to set LPM of the regulator " pr_err("Could not set LPM for v1p8\n");
"HSUSB_1p8\n", __func__);
ret = regulator_set_optimum_mode(motg->v3p3, ret = regulator_set_optimum_mode(motg->v3p3,
USB_PHY_3P3_LPM_LOAD); USB_PHY_3P3_LPM_LOAD);
if (ret < 0) if (ret < 0)
pr_err("%s: Unable to set LPM of the regulator " pr_err("Could not set LPM for v3p3\n");
"HSUSB_3p3\n", __func__);
} }
pr_debug("reg (%s)\n", on ? "HPM" : "LPM"); 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); ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
if (ret) { if (ret) {
pr_err("%s: unable to set the voltage for regulator " pr_err("Cannot set vddcx voltage\n");
"HSUSB_VDDCX\n", __func__);
return ret; return ret;
} }
@ -546,8 +537,7 @@ static int msm_otg_resume(struct msm_otg *motg)
* PHY. USB state can not be restored. Re-insertion * PHY. USB state can not be restored. Re-insertion
* of USB cable is the only way to get USB working. * of USB cable is the only way to get USB working.
*/ */
dev_err(phy->dev, "Unable to resume USB." dev_err(phy->dev, "Unable to resume USB. Re-plugin the cable\n");
"Re-plugin the cable\n");
msm_otg_reset(phy); msm_otg_reset(phy);
} }
@ -1242,13 +1232,13 @@ static int msm_otg_mode_show(struct seq_file *s, void *unused)
switch (otg->phy->state) { switch (otg->phy->state) {
case OTG_STATE_A_HOST: case OTG_STATE_A_HOST:
seq_printf(s, "host\n"); seq_puts(s, "host\n");
break; break;
case OTG_STATE_B_PERIPHERAL: case OTG_STATE_B_PERIPHERAL:
seq_printf(s, "peripheral\n"); seq_puts(s, "peripheral\n");
break; break;
default: default:
seq_printf(s, "none\n"); seq_puts(s, "none\n");
break; break;
} }
@ -1525,8 +1515,7 @@ static int msm_otg_probe(struct platform_device *pdev)
motg->pdata->otg_control == OTG_USER_CONTROL) { motg->pdata->otg_control == OTG_USER_CONTROL) {
ret = msm_otg_debugfs_init(motg); ret = msm_otg_debugfs_init(motg);
if (ret) if (ret)
dev_dbg(&pdev->dev, "mode debugfs file is" dev_dbg(&pdev->dev, "Can not create mode change file\n");
"not available\n");
} }
pm_runtime_set_active(&pdev->dev); pm_runtime_set_active(&pdev->dev);