[media] s5p-mfc: don't break long lines

Due to the 80-cols restrictions, and latter due to checkpatch
warnings, several strings were broken into multiple lines. This
is not considered a good practice anymore, as it makes harder
to grep for strings at the source code.

As we're right now fixing other drivers due to KERN_CONT, we need
to be able to identify what printk strings don't end with a "\n".
It is a way easier to detect those if we don't break long lines.

So, join those continuation lines.

The patch was generated via the script below, and manually
adjusted if needed.

</script>
use Text::Tabs;
while (<>) {
	if ($next ne "") {
		$c=$_;
		if ($c =~ /^\s+\"(.*)/) {
			$c2=$1;
			$next =~ s/\"\n$//;
			$n = expand($next);
			$funpos = index($n, '(');
			$pos = index($c2, '",');
			if ($funpos && $pos > 0) {
				$s1 = substr $c2, 0, $pos + 2;
				$s2 = ' ' x ($funpos + 1) . substr $c2, $pos + 2;
				$s2 =~ s/^\s+//;

				$s2 = ' ' x ($funpos + 1) . $s2 if ($s2 ne "");

				print unexpand("$next$s1\n");
				print unexpand("$s2\n") if ($s2 ne "");
			} else {
				print "$next$c2\n";
			}
			$next="";
			next;
		} else {
			print $next;
		}
		$next="";
	} else {
		if (m/\"$/) {
			if (!m/\\n\"$/) {
				$next=$_;
				next;
			}
		}
	}
	print $_;
}
</script>

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 52081ddc9bf249f990c89f386f602e75a8edb378..cf787eae11b7953e8cfec22126d875bdd5ab0999 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -793,18 +793,17 @@ static int vidioc_g_crop(struct file *file, void *priv,
                cr->c.top = top;
                cr->c.width = ctx->img_width - left - right;
                cr->c.height = ctx->img_height - top - bottom;
-               mfc_debug(2, "Cropping info [h264]: l=%d t=%d "
-                       "w=%d h=%d (r=%d b=%d fw=%d fh=%d\n", left, top,
-                       cr->c.width, cr->c.height, right, bottom,
-                       ctx->buf_width, ctx->buf_height);
+               mfc_debug(2, "Cropping info [h264]: l=%d t=%d w=%d h=%d (r=%d b=%d fw=%d fh=%d\n",
+                         left, top, cr->c.width, cr->c.height, right, bottom,
+                         ctx->buf_width, ctx->buf_height);
        } else {
                cr->c.left = 0;
                cr->c.top = 0;
                cr->c.width = ctx->img_width;
                cr->c.height = ctx->img_height;
-               mfc_debug(2, "Cropping info: w=%d h=%d fw=%d "
-                       "fh=%d\n", cr->c.width, cr->c.height, ctx->buf_width,
-                                                       ctx->buf_height);
+               mfc_debug(2, "Cropping info: w=%d h=%d fw=%d fh=%d\n",
+                         cr->c.width,  cr->c.height, ctx->buf_width,
+                         ctx->buf_height);
        }
        return 0;
 }

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 81e1e4ce6c2452dd76a24d4490a60257f4059e26..f4301d5bbd328ff5f118dc8a4fe44016827de869 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -1293,14 +1293,11 @@ static int s5p_mfc_run_init_dec_buffers(struct s5p_mfc_ctx *ctx)
         * First set the output frame buffers
         */
        if (ctx->capture_state != QUEUE_BUFS_MMAPED) {
-               mfc_err("It seems that not all destionation buffers were "
-                       "mmaped\nMFC requires that all destination are mmaped "
-                       "before starting processing\n");
+               mfc_err("It seems that not all destionation buffers were mmaped\nMFC requires that all destination are mmaped before starting processing\n");
                return -EAGAIN;
        }
        if (list_empty(&ctx->src_queue)) {
-               mfc_err("Header has been deallocated in the middle of"
-                       " initialization\n");
+               mfc_err("Header has been deallocated in the middle of initialization\n");
                return -EIO;
        }
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);