diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-10 07:04:44 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 08:09:19 -0400 |
commit | 57265bc114fd71e721a314f481902cd4f4d3d05f (patch) | |
tree | b5f41c1aaa6a774e2f67dfab487e5cb917931994 /drivers/mfd | |
parent | e62ccf3a7a21d62d92520f47ba5bd7e2112d8c1b (diff) |
mfd: Convert db8500-prcmu panic() into pr_crit()
panic() is too heavy for this, indeed the PRCMU is critical for
the system but not to the point that we should stop everything,
if we can still get a prompt or so.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index e996d11980fa..a25ab9c6b5af 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
@@ -1763,7 +1763,7 @@ retry: | |||
1763 | 1763 | ||
1764 | if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, | 1764 | if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, |
1765 | msecs_to_jiffies(5000))) { | 1765 | msecs_to_jiffies(5000))) { |
1766 | panic("prcmu: %s timed out (5 s) waiting for a reply.\n", | 1766 | pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n", |
1767 | __func__); | 1767 | __func__); |
1768 | goto unlock_and_return; | 1768 | goto unlock_and_return; |
1769 | } | 1769 | } |
@@ -1785,7 +1785,7 @@ retry: | |||
1785 | if (wait_for_completion_timeout(&mb0_transfer.ac_wake_work, | 1785 | if (wait_for_completion_timeout(&mb0_transfer.ac_wake_work, |
1786 | msecs_to_jiffies(5000))) | 1786 | msecs_to_jiffies(5000))) |
1787 | goto retry; | 1787 | goto retry; |
1788 | panic("prcmu: %s timed out (5 s) waiting for AC_SLEEP_ACK.\n", | 1788 | pr_crit("prcmu: %s timed out (5 s) waiting for AC_SLEEP_ACK.\n", |
1789 | __func__); | 1789 | __func__); |
1790 | } | 1790 | } |
1791 | 1791 | ||
@@ -1811,7 +1811,7 @@ void prcmu_ac_sleep_req() | |||
1811 | 1811 | ||
1812 | if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, | 1812 | if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, |
1813 | msecs_to_jiffies(5000))) { | 1813 | msecs_to_jiffies(5000))) { |
1814 | panic("prcmu: %s timed out (5 s) waiting for a reply.\n", | 1814 | pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n", |
1815 | __func__); | 1815 | __func__); |
1816 | } | 1816 | } |
1817 | 1817 | ||