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

Commit 9bb05378 authored by Nishanth Menon's avatar Nishanth Menon Committed by Kevin Hilman
Browse files

ARM: OMAP2+: PM: VP: minor pr_warn updates 



change pr_warnings to pr_warn and ensure a newline
is present in all messages

Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 6f0c0580

arch/arm/mach-omap2/vp.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm, 
		udelay(1);

		udelay(1);

	}

	}

	if (timeout >= VP_TRANXDONE_TIMEOUT) {

	if (timeout >= VP_TRANXDONE_TIMEOUT) {

		pr_warn("%s: vdd_%s TRANXDONE timeout exceeded. Voltage change aborted",

		pr_warn("%s: vdd_%s TRANXDONE timeout exceeded. Voltage change aborted\n",

			__func__, voltdm->name);

			__func__, voltdm->name);

		return -ETIMEDOUT;

		return -ETIMEDOUT;

	}

	}
@@ -197,7 +197,7 @@ void omap_vp_enable(struct voltagedomain *voltdm) 
	u32 vpconfig, volt;

	u32 vpconfig, volt;





	if (!voltdm || IS_ERR(voltdm)) {

	if (!voltdm || IS_ERR(voltdm)) {

		pr_warning("%s: VDD specified does not exist!\n", __func__);

		pr_warn("%s: VDD specified does not exist!\n", __func__);

		return;

		return;

	}

	}
@@ -214,7 +214,7 @@ void omap_vp_enable(struct voltagedomain *voltdm) 




	volt = voltdm_get_voltage(voltdm);

	volt = voltdm_get_voltage(voltdm);

	if (!volt) {

	if (!volt) {

		pr_warning("%s: unable to find current voltage for %s\n",

		pr_warn("%s: unable to find current voltage for %s\n",

			__func__, voltdm->name);

			__func__, voltdm->name);

		return;

		return;

	}

	}
@@ -242,7 +242,7 @@ void omap_vp_disable(struct voltagedomain *voltdm) 
	int timeout;

	int timeout;





	if (!voltdm || IS_ERR(voltdm)) {

	if (!voltdm || IS_ERR(voltdm)) {

		pr_warning("%s: VDD specified does not exist!\n", __func__);

		pr_warn("%s: VDD specified does not exist!\n", __func__);

		return;

		return;

	}

	}
@@ -272,8 +272,7 @@ void omap_vp_disable(struct voltagedomain *voltdm) 
			  VP_IDLE_TIMEOUT, timeout);

			  VP_IDLE_TIMEOUT, timeout);





	if (timeout >= VP_IDLE_TIMEOUT)

	if (timeout >= VP_IDLE_TIMEOUT)

		pr_warning("%s: vdd_%s idle timedout\n",

		pr_warn("%s: vdd_%s idle timedout\n", __func__, voltdm->name);

			__func__, voltdm->name);





	vp->enabled = false;

	vp->enabled = false;