[media] davinci: 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: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index c90b9a4..65c2973 100644 (file)
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -334,8 +334,8 @@ static int ccdc_set_params(void __user *params)
 
        x = copy_from_user(&ccdc_raw_params, params, sizeof(ccdc_raw_params));
        if (x) {
-               dev_dbg(ccdc_cfg.dev, "ccdc_set_params: error in copying ccdc"
-                       "params, %d\n", x);
+               dev_dbg(ccdc_cfg.dev, "ccdc_set_params: error in copying ccdcparams, %d\n",
+                       x);
                return -EFAULT;
        }
 

diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index 6fba32b..c7523a7 100644 (file)
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -354,8 +354,8 @@ static int ccdc_set_params(void __user *params)
 
        x = copy_from_user(&ccdc_raw_params, params, sizeof(ccdc_raw_params));
        if (x) {
-               dev_dbg(ccdc_cfg.dev, "ccdc_set_params: error in copying"
-                          "ccdc params, %d\n", x);
+               dev_dbg(ccdc_cfg.dev, "ccdc_set_params: error in copyingccdc params, %d\n",
+                       x);
                return -EFAULT;
        }
 

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 9a6c2cc..7d26707 100644 (file)
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -705,15 +705,13 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
                                          "v4l2 sub device %s registered\n",
                                          enc_info->module_name);
                        else {
-                               v4l2_err(&vpbe_dev->v4l2_dev, "encoder %s"
-                                        " failed to register",
+                               v4l2_err(&vpbe_dev->v4l2_dev, "encoder %s failed to register",
                                         enc_info->module_name);
                                ret = -ENODEV;
                                goto fail_kfree_encoders;
                        }
                } else
-                       v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c encoders"
-                                " currently not supported");
+                       v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c encoders currently not supported");
        }
        /* Add amplifier subdevice for dm365 */
        if ((strcmp(vpbe_dev->cfg->module_name, "dm365-vpbe-display") == 0) &&
@@ -735,8 +733,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
                                          amp_info->module_name);
                } else {
                            vpbe_dev->amp = NULL;
-                           v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c amplifiers"
-                           " currently not supported");
+                           v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c amplifiers currently not supported");
                }
        } else {
            vpbe_dev->amp = NULL;
@@ -835,15 +832,13 @@ static int vpbe_probe(struct platform_device *pdev)
        if (!cfg->module_name[0] ||
            !cfg->osd.module_name[0] ||
            !cfg->venc.module_name[0]) {
-               v4l2_err(pdev->dev.driver, "vpbe display module names not"
-                        " defined\n");
+               v4l2_err(pdev->dev.driver, "vpbe display module names not defined\n");
                return ret;
        }
 
        vpbe_dev = kzalloc(sizeof(*vpbe_dev), GFP_KERNEL);
        if (vpbe_dev == NULL) {
-               v4l2_err(pdev->dev.driver, "Unable to allocate memory"
-                        " for vpbe_device\n");
+               v4l2_err(pdev->dev.driver, "Unable to allocate memory for vpbe_device\n");
                return -ENOMEM;
        }
        vpbe_dev->cfg = cfg;

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 6efb2f1..ca22c34 100644 (file)
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -919,8 +919,7 @@ static const struct vpfe_pixel_format *
        else
                pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;
 
-       v4l2_info(&vpfe_dev->v4l2_dev, "adjusted width = %d, height ="
-                " %d, bpp = %d, bytesperline = %d, sizeimage = %d\n",
+       v4l2_info(&vpfe_dev->v4l2_dev, "adjusted width = %d, height = %d, bpp = %d, bytesperline = %d, sizeimage = %d\n",
                 pixfmt->width, pixfmt->height, vpfe_pix_fmt->bpp,
                 pixfmt->bytesperline, pixfmt->sizeimage);
        return vpfe_pix_fmt;
@@ -1088,8 +1087,7 @@ static int vpfe_enum_input(struct file *file, void *priv,
                                        &subdev,
                                        &index,
                                        inp->index) < 0) {
-               v4l2_err(&vpfe_dev->v4l2_dev, "input information not found"
-                        " for the subdev\n");
+               v4l2_err(&vpfe_dev->v4l2_dev, "input information not found for the subdev\n");
                return -EINVAL;
        }
        sdinfo = &vpfe_dev->cfg->sub_devs[subdev];

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 5104cc0..c6a3a90 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1152,11 +1152,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
                                timings->bt.vfrontporch &&
                                (timings->bt.vbackporch ||
                                 timings->bt.vsync))) {
-               vpif_dbg(2, debug, "Timings for width, height, "
-                               "horizontal back porch, horizontal sync, "
-                               "horizontal front porch, vertical back porch, "
-                               "vertical sync and vertical back porch "
-                               "must be defined\n");
+               vpif_dbg(2, debug, "Timings for width, height, horizontal back porch, horizontal sync, horizontal front porch, vertical back porch, vertical sync and vertical back porch must be defined\n");
                return -EINVAL;
        }
 
@@ -1181,8 +1177,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
                        std_info->l11 = std_info->vsize -
                                (bt->il_vfrontporch - 1);
                } else {
-                       vpif_dbg(2, debug, "Required timing values for "
-                                       "interlaced BT format missing\n");
+                       vpif_dbg(2, debug, "Required timing values for interlaced BT format missing\n");
                        return -EINVAL;
                }
        } else {

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 75b2723..6b3ea1e 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -954,11 +954,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
                                timings->bt.vfrontporch &&
                                (timings->bt.vbackporch ||
                                 timings->bt.vsync))) {
-               vpif_dbg(2, debug, "Timings for width, height, "
-                               "horizontal back porch, horizontal sync, "
-                               "horizontal front porch, vertical back porch, "
-                               "vertical sync and vertical back porch "
-                               "must be defined\n");
+               vpif_dbg(2, debug, "Timings for width, height, horizontal back porch, horizontal sync, horizontal front porch, vertical back porch, vertical sync and vertical back porch must be defined\n");
                return -EINVAL;
        }
 
@@ -983,8 +979,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
                        std_info->l11 = std_info->vsize -
                                (bt->il_vfrontporch - 1);
                } else {
-                       vpif_dbg(2, debug, "Required timing values for "
-                                       "interlaced BT format missing\n");
+                       vpif_dbg(2, debug, "Required timing values for interlaced BT format missing\n");
                        return -EINVAL;
                }
        } else {

diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index fce86f1..373b796 100644 (file)
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -261,8 +261,8 @@ static int dm355_enable_clock(enum vpss_clock_sel clock_sel, int en)
                shift = 6;
                break;
        default:
-               printk(KERN_ERR "dm355_enable_clock:"
-                               " Invalid selector: %d\n", clock_sel);
+               printk(KERN_ERR "dm355_enable_clock: Invalid selector: %d\n",
+                      clock_sel);
                return -EINVAL;
        }
 
@@ -421,8 +421,7 @@ static int vpss_probe(struct platform_device *pdev)
        else if (!strcmp(platform_name, "dm644x_vpss"))
                oper_cfg.platform = DM644X;
        else {
-               dev_err(&pdev->dev, "vpss driver not supported on"
-                       " this platform\n");
+               dev_err(&pdev->dev, "vpss driver not supported on this platform\n");
                return -ENODEV;
        }