Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQmZ7yAAoJEFk3GJrT+8Zld5gP/i7GNZyjTT7HyWERzBpNLFIK 0dOt5V/zvqP809sM8wyW/o5hA4S6V72CGUDG39Ev2AJLp0jM44GDGREjhsCkzg1p Y2ruy6i96yuIavmsWW7zlnSuwmzrENSUzJdRaBsIwiS5lFLqS/NKK6TuWGHah37w mYAhLkzviyB0cRb2T1YPzufVkvKOCPB0kM4/vnL/kwDjlOa0GkM4iJpsoKH5dB3f b+xQdeUuuTtw6ca7khZ7I8EwSIMF3Uq8SqmWVAPXQIX6vLwQVoBsVzUyEN1/n1wo qL8xaH7wbL0a1IFSFZNYEqdyVlVg0V8G250rxs9PmRhmcYKObjiovMVXUwx3xPAe O+I2kkh08HvihS7tYwf7r/8gm55a0CchblZYSVO2VuMy0jLXYVd/YrS7DOIxureA 0853S+R+slK2WenO3N4kyb3oBmP0IuXYHjve2bSI/TgGxKiMW9fYDVwxbfCHni95 dfQHjr7KVQZCCTSiAHFYAH/dmvRK+N0uafN2lVacLFq80U5ITvfpaE2ZIgKSSDE+ C4fIdppNISCAUtW6tchfN/R4kjIZzxoPLXnhrOYyQnVXtBaOMqxgQ72PUhkKEMtj duEQ92UvWgAy/yT1cUrM+vu9+dfNfPEfAaxtBrSzCkYS3r2XV/w1QXKi72HKbX8B xyDkbSCk6WyUQ7zu06SW =yFR+ -----END PGP SIGNATURE----- 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)
This commit is contained in:
commit
1d1186f5ca
@ -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,8 +214,8 @@ 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",
|
||||
__func__, voltdm->name);
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user