From 7287bb5258800d93dc8f5eb5115025c75a69014b Mon Sep 17 00:00:00 2001 From: Iulia Manda Date: Tue, 11 Mar 2014 20:10:37 +0200 Subject: staging: android: ion: Fix quoted string split across lines Join strings from two separated lines, even if this makes line longer than 80 characters. Signed-off-by: Iulia Manda Acked-by: Paul E. McKenney Signed-off-by: Peter P Waskiewicz Jr --- drivers/staging/android/ion/ion.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 08367179a48c..2aaab27cdf5b 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1003,8 +1003,8 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) int ret = 0; if (!buffer->heap->ops->map_user) { - pr_err("%s: this heap does not define a method for mapping " - "to userspace\n", __func__); + pr_err("%s: this heap does not define a method for mapping to userspace\n", + __func__); return -EINVAL; } @@ -1407,8 +1407,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused) } } seq_printf(s, "----------------------------------------------------\n"); - seq_printf(s, "orphaned allocations (info is from last known client):" - "\n"); + seq_printf(s, "orphaned allocations (info is from last known client):\n"); mutex_lock(&dev->buffer_lock); for (n = rb_first(&dev->buffers); n; n = rb_next(n)) { struct ion_buffer *buffer = rb_entry(n, struct ion_buffer, -- cgit v1.2.3