[PATCH v2 49/58] zr364xx: don't break long lines

[Mauro Carvalho Chehab]

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 <mche...@s-opensource.com>
---
 drivers/media/usb/zr364xx/zr364xx.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/zr364xx/zr364xx.c 
b/drivers/media/usb/zr364xx/zr364xx.c
index cc128db85723..3950708cbb32 100644
--- a/drivers/media/usb/zr364xx/zr364xx.c
+++ b/drivers/media/usb/zr364xx/zr364xx.c
@@ -633,8 +633,7 @@ static int zr364xx_read_video_callback(struct 
zr364xx_camera *cam,
        } else {
                if (frm->cur_size + purb->actual_length > MAX_FRAME_SIZE) {
                        dev_info(&cam->udev->dev,
-                                "%s: buffer (%d bytes) too small to hold "
-                                "frame data. Discarding frame data.\n",
+                                "%s: buffer (%d bytes) too small to hold frame 
data. Discarding frame data.\n",
                                 __func__, MAX_FRAME_SIZE);
                } else {
                        pdest += frm->cur_size;
@@ -1373,8 +1372,7 @@ static int zr364xx_board_init(struct zr364xx_camera *cam)
                        &cam->buffer.frame[i], i,
                        cam->buffer.frame[i].lpvbits);
                if (cam->buffer.frame[i].lpvbits == NULL) {
-                       printk(KERN_INFO KBUILD_MODNAME ": out of memory. "
-                              "Using less frames\n");
+                       printk(KERN_INFO KBUILD_MODNAME ": out of memory. Using 
less frames\n");
                        break;
                }
        }
-- 
2.7.4


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html