[media] saa7134: 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:
@ -123,8 +123,7 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_type *protocol,
|
||||
struct saa7134_dev *dev = ir->c->adapter->algo_data;
|
||||
|
||||
if (dev == NULL) {
|
||||
ir_dbg(ir, "get_key_flydvb_trio: "
|
||||
"ir->c->adapter->algo_data is NULL!\n");
|
||||
ir_dbg(ir, "get_key_flydvb_trio: ir->c->adapter->algo_data is NULL!\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
@ -150,8 +149,8 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_type *protocol,
|
||||
msleep(10);
|
||||
continue;
|
||||
}
|
||||
ir_dbg(ir, "send wake up byte to pic16C505 (IR chip)"
|
||||
"failed %dx\n", attempt);
|
||||
ir_dbg(ir, "send wake up byte to pic16C505 (IR chip)failed %dx\n",
|
||||
attempt);
|
||||
return -EIO;
|
||||
}
|
||||
if (1 != i2c_master_recv(ir->c, &b, 1)) {
|
||||
@ -174,8 +173,7 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, enum rc_type *protocol
|
||||
/* <dev> is needed to access GPIO. Used by the saa_readl macro. */
|
||||
struct saa7134_dev *dev = ir->c->adapter->algo_data;
|
||||
if (dev == NULL) {
|
||||
ir_dbg(ir, "get_key_msi_tvanywhere_plus: "
|
||||
"ir->c->adapter->algo_data is NULL!\n");
|
||||
ir_dbg(ir, "get_key_msi_tvanywhere_plus: ir->c->adapter->algo_data is NULL!\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
@ -223,8 +221,7 @@ static int get_key_kworld_pc150u(struct IR_i2c *ir, enum rc_type *protocol,
|
||||
/* <dev> is needed to access GPIO. Used by the saa_readl macro. */
|
||||
struct saa7134_dev *dev = ir->c->adapter->algo_data;
|
||||
if (dev == NULL) {
|
||||
ir_dbg(ir, "get_key_kworld_pc150u: "
|
||||
"ir->c->adapter->algo_data is NULL!\n");
|
||||
ir_dbg(ir, "get_key_kworld_pc150u: ir->c->adapter->algo_data is NULL!\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user