diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-18 17:44:06 -0200 | 
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-21 09:12:16 -0200 | 
| commit | 2d96b44f0abfd429816d66148b75bad84a625f3b (patch) | |
| tree | 80d7d4273482d97e7fe6b2b0c01b8083e4e5c9a3 /drivers/media/pci/pt1 | |
| parent | f8a3dcb5a927141610e30d01e5782ba4a4516980 (diff) | |
| download | linux-2d96b44f0abfd429816d66148b75bad84a625f3b.tar.bz2 | |
[media] pt1: 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>
Diffstat (limited to 'drivers/media/pci/pt1')
| -rw-r--r-- | drivers/media/pci/pt1/pt1.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c index e7e4428109c3..d5ee82aee9e8 100644 --- a/drivers/media/pci/pt1/pt1.c +++ b/drivers/media/pci/pt1/pt1.c @@ -282,13 +282,12 @@ static int pt1_filter(struct pt1 *pt1, struct pt1_buffer_page *page)  			continue;  		if (upacket >> 24 & 1) -			printk_ratelimited(KERN_INFO "earth-pt1: device " -				"buffer overflowing. table[%d] buf[%d]\n", +			printk_ratelimited(KERN_INFO "earth-pt1: device buffer overflowing. table[%d] buf[%d]\n",  				pt1->table_index, pt1->buf_index);  		sc = upacket >> 26 & 0x7;  		if (adap->st_count != -1 && sc != ((adap->st_count + 1) & 0x7)) -			printk_ratelimited(KERN_INFO "earth-pt1: data loss" -				" in streamID(adapter)[%d]\n", index); +			printk_ratelimited(KERN_INFO "earth-pt1: data loss in streamID(adapter)[%d]\n", +					   index);  		adap->st_count = sc;  		buf = adap->buf; |