diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-07-26 02:54:26 -0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-12 04:57:10 -0400 |
| commit | 7852ec0536ca39cefffc6301dc77f8ae55592926 (patch) | |
| tree | faa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | a032d33b65c89a781c871fd1def595fa6a69b52a (diff) | |
ARM: OMAP: unwrap strings
Find and unwrap wrapped strings in the style:
pr_debug("clockdomain: hardware cannot set/clear wake up of "
"%s when %s wakes up\n", clkdm1->name, clkdm2->name);
Keeping these strings contiguous seems to be the current Linux kernel
policy.
The offending lines were found with the following command:
pcregrep -rnM '"\s*$\s*"' arch/arm/*omap*
While here, some messages have been clarified, some pr_warning(
... calls have been converted to pr_warn( ..., and some printk(KERN_*
... have been converted to pr_*.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index bd69eaefcc97..ae0dd96f7795 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -1641,8 +1641,8 @@ static int _ocp_softreset(struct omap_hwmod *oh) | |||
| 1641 | 1641 | ||
| 1642 | /* clocks must be on for this operation */ | 1642 | /* clocks must be on for this operation */ |
| 1643 | if (oh->_state != _HWMOD_STATE_ENABLED) { | 1643 | if (oh->_state != _HWMOD_STATE_ENABLED) { |
| 1644 | pr_warning("omap_hwmod: %s: reset can only be entered from " | 1644 | pr_warn("omap_hwmod: %s: reset can only be entered from enabled state\n", |
| 1645 | "enabled state\n", oh->name); | 1645 | oh->name); |
| 1646 | return -EINVAL; | 1646 | return -EINVAL; |
| 1647 | } | 1647 | } |
| 1648 | 1648 | ||