diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 20:08:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 20:08:01 -0700 |
| commit | 3a839ce4f7e1446167cbb51189235e2f1b9a67a4 (patch) | |
| tree | eda98bbe42fec340933fd6ea6834e32ff98c28b3 /arch/arm/mach-omap1/dma.c | |
| parent | 8e51036d348956a3cdb5a977234c395fdb82e170 (diff) | |
| parent | 3c101c41fbe5daf88afbbd575542aa1d047812bb (diff) | |
Merge tag 'omap-cleanup-makefile-sparse-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
Clean up and standardize several parts of
arch/arm/mach-omap2/Makefile. Beyond readability and diffstat
improvements, the series should reduce the risk of conflicts during
future cleanups by ensuring related lines are in the same section of the
Makefile.
smatch and string-wrapping cleanups for the OMAP subarch code.
These changes fix some of the more meaningful warnings that smatch
returns for the OMAP subarch code, and unwraps strings that are
wrapped at the 80-column boundary, to conform with the current
practice.
* tag 'omap-cleanup-makefile-sparse-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: unwrap strings
ARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ...
ARM: OMAP2+: clean up PRCM sections of the Makefile
ARM: OMAP2+: clean up OMAP clock Makefile sections
ARM: OMAP2+: clean up OMAP4 PRM & sleep build directives in Makefile
ARM: OMAP2+: move MPU INTCPS, secure monitor, SDRC build directives in Makefile
ARM: OMAP2+: clean up omap_hwmod.o build directives in Makefile
ARM: OMAP2+: clean up whitespace in Makefile
Diffstat (limited to 'arch/arm/mach-omap1/dma.c')
| -rw-r--r-- | arch/arm/mach-omap1/dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c index b0b0f0f27450..29007fef84cd 100644 --- a/arch/arm/mach-omap1/dma.c +++ b/arch/arm/mach-omap1/dma.c @@ -331,8 +331,9 @@ static int __init omap1_system_dma_init(void) d->chan = kzalloc(sizeof(struct omap_dma_lch) * (d->lch_count), GFP_KERNEL); if (!d->chan) { - dev_err(&pdev->dev, "%s: Memory allocation failed" - "for d->chan!!!\n", __func__); + dev_err(&pdev->dev, + "%s: Memory allocation failed for d->chan!\n", + __func__); goto exit_release_d; } |