Commit 759a4ed4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] platform: 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>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4c481739
...@@ -724,9 +724,9 @@ static int emmaprp_buf_prepare(struct vb2_buffer *vb) ...@@ -724,9 +724,9 @@ static int emmaprp_buf_prepare(struct vb2_buffer *vb)
q_data = get_q_data(ctx, vb->vb2_queue->type); q_data = get_q_data(ctx, vb->vb2_queue->type);
if (vb2_plane_size(vb, 0) < q_data->sizeimage) { if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
dprintk(ctx->dev, "%s data will not fit into plane" dprintk(ctx->dev,
"(%lu < %lu)\n", __func__, "%s data will not fit into plane(%lu < %lu)\n",
vb2_plane_size(vb, 0), __func__, vb2_plane_size(vb, 0),
(long)q_data->sizeimage); (long)q_data->sizeimage);
return -EINVAL; return -EINVAL;
} }
......
...@@ -2347,8 +2347,7 @@ static int pxa_camera_probe(struct platform_device *pdev) ...@@ -2347,8 +2347,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
* Platform hasn't set available data widths. This is bad. * Platform hasn't set available data widths. This is bad.
* Warn and use a default. * Warn and use a default.
*/ */
dev_warn(&pdev->dev, "WARNING! Platform hasn't set available " dev_warn(&pdev->dev, "WARNING! Platform hasn't set available data widths, using default 10 bit\n");
"data widths, using default 10 bit\n");
pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10; pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
} }
if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_8) if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_8)
...@@ -2359,8 +2358,7 @@ static int pxa_camera_probe(struct platform_device *pdev) ...@@ -2359,8 +2358,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->width_flags |= 1 << 9; pcdev->width_flags |= 1 << 9;
if (!pcdev->mclk) { if (!pcdev->mclk) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"mclk == 0! Please, fix your platform data. " "mclk == 0! Please, fix your platform data. Using default 20MHz\n");
"Using default 20MHz\n");
pcdev->mclk = 20000000; pcdev->mclk = 20000000;
} }
......
...@@ -39,15 +39,12 @@ MODULE_LICENSE("GPL"); ...@@ -39,15 +39,12 @@ MODULE_LICENSE("GPL");
static bool flip_image; static bool flip_image;
module_param(flip_image, bool, 0444); module_param(flip_image, bool, 0444);
MODULE_PARM_DESC(flip_image, MODULE_PARM_DESC(flip_image,
"If set, the sensor will be instructed to flip the image " "If set, the sensor will be instructed to flip the image vertically.");
"vertically.");
static bool override_serial; static bool override_serial;
module_param(override_serial, bool, 0444); module_param(override_serial, bool, 0444);
MODULE_PARM_DESC(override_serial, MODULE_PARM_DESC(override_serial,
"The camera driver will normally refuse to load if " "The camera driver will normally refuse to load if the XO 1.5 serial port is enabled. Set this option to force-enable the camera.");
"the XO 1.5 serial port is enabled. Set this option "
"to force-enable the camera.");
/* /*
* The structure describing our camera. * The structure describing our camera.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment