[media] dvb-frontends: 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>
Esse commit está contido em:
@@ -289,8 +289,7 @@ static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
|
||||
counter++;
|
||||
}
|
||||
|
||||
pr_warn("Timeout waiting for nxt200x to stop. This is ok after "
|
||||
"firmware upload.\n");
|
||||
pr_warn("Timeout waiting for nxt200x to stop. This is ok after firmware upload.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -893,8 +892,8 @@ static int nxt2002_init(struct dvb_frontend* fe)
|
||||
state->i2c->dev.parent);
|
||||
pr_debug("%s: Waiting for firmware upload(2)...\n", __func__);
|
||||
if (ret) {
|
||||
pr_err("%s: No firmware uploaded (timeout or file not found?)"
|
||||
"\n", __func__);
|
||||
pr_err("%s: No firmware uploaded (timeout or file not found?)\n",
|
||||
__func__);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -960,8 +959,8 @@ static int nxt2004_init(struct dvb_frontend* fe)
|
||||
state->i2c->dev.parent);
|
||||
pr_debug("%s: Waiting for firmware upload(2)...\n", __func__);
|
||||
if (ret) {
|
||||
pr_err("%s: No firmware uploaded (timeout or file not found?)"
|
||||
"\n", __func__);
|
||||
pr_err("%s: No firmware uploaded (timeout or file not found?)\n",
|
||||
__func__);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Referência em uma nova issue
Block a user