[media] usbvision: 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/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index c23bf73a68ea97ffc6f1f10b6c4d8bd157c7d5d2..bf041a9e69dbb65f7149df5050b1c9930fb4cbb4 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -1656,8 +1656,8 @@ static int usbvision_set_video_format(struct usb_usbvision *usbvision, int forma
                             (__u16) USBVISION_FILT_CONT, value, 2, HZ);
 
        if (rc < 0) {
-               printk(KERN_ERR "%s: ERROR=%d. USBVISION stopped - "
-                      "reconnect or reload driver.\n", proc, rc);
+               printk(KERN_ERR "%s: ERROR=%d. USBVISION stopped - reconnect or reload driver.\n",
+                      proc, rc);
        }
        usbvision->isoc_mode = format;
        return rc;
@@ -1890,8 +1890,8 @@ static int usbvision_set_compress_params(struct usb_usbvision *usbvision)
                             (__u16) USBVISION_INTRA_CYC, value, 5, HZ);
 
        if (rc < 0) {
-               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - "
-                      "reconnect or reload driver.\n", proc, rc);
+               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - reconnect or reload driver.\n",
+                      proc, rc);
                return rc;
        }
 
@@ -1921,8 +1921,8 @@ static int usbvision_set_compress_params(struct usb_usbvision *usbvision)
                             (__u16) USBVISION_PCM_THR1, value, 6, HZ);
 
        if (rc < 0) {
-               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - "
-                      "reconnect or reload driver.\n", proc, rc);
+               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - reconnect or reload driver.\n",
+                      proc, rc);
        }
        return rc;
 }
@@ -1960,8 +1960,8 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
 
        rc = usbvision_write_reg(usbvision, USBVISION_VIN_REG1, value[0]);
        if (rc < 0) {
-               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - "
-                      "reconnect or reload driver.\n", proc, rc);
+               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - reconnect or reload driver.\n",
+                      proc, rc);
                return rc;
        }
 
@@ -2026,8 +2026,8 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
                             USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0,
                             (__u16) USBVISION_LXSIZE_I, value, 8, HZ);
        if (rc < 0) {
-               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - "
-                      "reconnect or reload driver.\n", proc, rc);
+               printk(KERN_ERR "%sERROR=%d. USBVISION stopped - reconnect or reload driver.\n",
+                      proc, rc);
                return rc;
        }
 

diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index c8b4eb2ee7a2916522d1befd8655a70c46df6c3d..a7529196c327f8d8ad016ae7b46d68340cba81b4 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -1456,8 +1456,8 @@ static int usbvision_probe(struct usb_interface *intf,
        }
 
        if (interface->desc.bNumEndpoints < 2) {
-               dev_err(&intf->dev, "interface %d has %d endpoints, but must"
-                   " have minimum 2\n", ifnum, interface->desc.bNumEndpoints);
+               dev_err(&intf->dev, "interface %d has %d endpoints, but must have minimum 2\n",
+                       ifnum, interface->desc.bNumEndpoints);
                ret = -ENODEV;
                goto err_usb;
        }