Commit 1d1186f5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for_3.8-cleanup-pm' of... 

Merge tag 'for_3.8-cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm

Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
parents 3d70f8c6 9bb05378

arch/arm/mach-omap2/vp.c

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

	}

	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);

		return -ETIMEDOUT;

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



	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;

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


	volt = voltdm_get_voltage(voltdm);

	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);

		return;

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



	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;

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



	if (timeout >= VP_IDLE_TIMEOUT)

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

			__func__, voltdm->name);

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



	vp->enabled = false;