Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aca0fa9 authored by Ivan T. Ivanov's avatar Ivan T. Ivanov Committed by Felipe Balbi
Browse files

usb: phy: msm: Fix checkpatch.pl warnings 



This fixes following:

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

Signed-off-by: default avatarIvan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f7ddad47

drivers/usb/phy/phy-msm-usb.c

+14 −25
Original line number Diff line number Diff line
@@ -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__);

		pr_err("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;

	}
@@ -1525,8 +1515,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);