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/ttusb-budget/dvb-ttusb-budget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c 
b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index d52d4a8d39ad..361e40b56045 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -767,8 +767,7 @@ static void ttusb_iso_irq(struct urb *urb)
                for (i = 0; i < urb->number_of_packets; ++i) {
                        numpkt++;
                        if (time_after_eq(jiffies, lastj + HZ)) {
-                               dprintk("frames/s: %lu (ts: %d, stuff %d, "
-                                       "sec: %d, invalid: %d, all: %d)\n",
+                               dprintk("frames/s: %lu (ts: %d, stuff %d, sec: 
%d, invalid: %d, all: %d)\n",
                                        numpkt * HZ / (jiffies - lastj),
                                        numts, numstuff, numsec, numinvalid,
                                        numts + numstuff + numsec + numinvalid);
-- 
2.7.4


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

Reply via email to