summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulia Manda <iulia.manda21@gmail.com>2014-03-11 20:10:37 +0200
committerPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2014-03-13 16:33:43 -0700
commit7287bb5258800d93dc8f5eb5115025c75a69014b (patch)
tree6aeb45fa2dcaa95f249643f6bef23bc513a1a180
parentb812982e6b9ce3797f160ad3778766db107b5086 (diff)
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 <iulia.manda21@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
-rw-r--r--drivers/staging/android/ion/ion.c7
1 files 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,