aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/dma.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-07-26 02:54:26 -0400
committerPaul Walmsley <paul@pwsan.com>2012-09-12 04:57:10 -0400
commit7852ec0536ca39cefffc6301dc77f8ae55592926 (patch)
treefaa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap1/dma.c
parenta032d33b65c89a781c871fd1def595fa6a69b52a (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-omap1/dma.c')
-rw-r--r--arch/arm/mach-omap1/dma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 3ef7d52316b4..f51014d1a614 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -330,8 +330,9 @@ static int __init omap1_system_dma_init(void)
330 d->chan = kzalloc(sizeof(struct omap_dma_lch) * 330 d->chan = kzalloc(sizeof(struct omap_dma_lch) *
331 (d->lch_count), GFP_KERNEL); 331 (d->lch_count), GFP_KERNEL);
332 if (!d->chan) { 332 if (!d->chan) {
333 dev_err(&pdev->dev, "%s: Memory allocation failed" 333 dev_err(&pdev->dev,
334 "for d->chan!!!\n", __func__); 334 "%s: Memory allocation failed for d->chan!\n",
335 __func__);
335 goto exit_release_d; 336 goto exit_release_d;
336 } 337 }
337 338