aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulia Manda <iulia.manda21@gmail.com>2014-03-11 20:10:37 +0200
committerMister Oyster <oysterized@gmail.com>2016-12-11 11:52:35 +0100
commita3529e65ae356d5211ecc22ed1a7be0226185b53 (patch)
tree2419002dafb3ec4dde8845184c4b16e97a490703
parentc184beb451750d03557c83f33a948dd5a53b1f93 (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 e692d5b0f..0d7a7fbdf 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1209,8 +1209,8 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
MMProfileLogEx(ION_MMP_Events[PROFILE_MAP_USER], MMProfileFlagStart, buffer->size, vma->vm_start);
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;
}
@@ -1682,8 +1682,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
up_read(&dev->lock);
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,