aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/tm6000/tm6000-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-10-18 15:44:19 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-10-21 07:53:59 -0400
commit68616504573945c24fe8f21466967b0d8a5cabf0 (patch)
tree95d0ce1f709769928caaa812b09197fa1d8dc641 /drivers/media/usb/tm6000/tm6000-i2c.c
parentb4b3f99c8d77e2edd02fdfc791c194641f3e9fc3 (diff)
[media] tm6000: 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/usb/tm6000/tm6000-i2c.c')
-rw-r--r--drivers/media/usb/tm6000/tm6000-i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-i2c.c b/drivers/media/usb/tm6000/tm6000-i2c.c
index c7e23e3dd75e..b01d3ee56e77 100644
--- a/drivers/media/usb/tm6000/tm6000-i2c.c
+++ b/drivers/media/usb/tm6000/tm6000-i2c.c
@@ -173,8 +173,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
173 * immediately after a 1 or 2 byte write to select 173 * immediately after a 1 or 2 byte write to select
174 * a register. We cannot fulfil this request. 174 * a register. We cannot fulfil this request.
175 */ 175 */
176 i2c_dprintk(2, " read without preceding write not" 176 i2c_dprintk(2, " read without preceding write not supported");
177 " supported");
178 rc = -EOPNOTSUPP; 177 rc = -EOPNOTSUPP;
179 goto err; 178 goto err;
180 } else if (i + 1 < num && msgs[i].len <= 2 && 179 } else if (i + 1 < num && msgs[i].len <= 2 &&