[media] dm1105: 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>
This commit is contained in:
parent
935747ff18
commit
0e8aebb52d
|
@ -315,8 +315,7 @@ static void dm1105_card_list(struct pci_dev *pci)
|
|||
"dm1105: Updating to the latest version might help\n"
|
||||
"dm1105: as well.\n");
|
||||
}
|
||||
printk(KERN_ERR "Here is a list of valid choices for the card=<n> "
|
||||
"insmod option:\n");
|
||||
printk(KERN_ERR "Here is a list of valid choices for the card=<n> insmod option:\n");
|
||||
for (i = 0; i < ARRAY_SIZE(dm1105_boards); i++)
|
||||
printk(KERN_ERR "dm1105: card=%d -> %s\n",
|
||||
i, dm1105_boards[i].name);
|
||||
|
|
Loading…
Reference in New Issue