[media] cx18: 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>
Cette révision appartient à :
@@ -353,8 +353,8 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
|
||||
if (cx->card->hw_all & CX18_HW_DVB) {
|
||||
s->dvb = kzalloc(sizeof(struct cx18_dvb), GFP_KERNEL);
|
||||
if (s->dvb == NULL) {
|
||||
CX18_ERR("Couldn't allocate cx18_dvb structure"
|
||||
" for %s\n", s->name);
|
||||
CX18_ERR("Couldn't allocate cx18_dvb structure for %s\n",
|
||||
s->name);
|
||||
return -ENOMEM;
|
||||
}
|
||||
} else {
|
||||
@@ -462,8 +462,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
|
||||
|
||||
case VFL_TYPE_VBI:
|
||||
if (cx->stream_buffers[type])
|
||||
CX18_INFO("Registered device %s for %s "
|
||||
"(%d x %d bytes)\n",
|
||||
CX18_INFO("Registered device %s for %s (%d x %d bytes)\n",
|
||||
name, s->name, cx->stream_buffers[type],
|
||||
cx->stream_buf_size[type]);
|
||||
else
|
||||
|
Référencer dans un nouveau ticket
Bloquer un utilisateur