diff options
author | Mauro Carvalho Chehab | 2016-10-18 21:44:19 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2016-10-21 13:53:16 +0200 |
commit | b4b3f99c8d77e2edd02fdfc791c194641f3e9fc3 (patch) | |
tree | 2c68d0c018e35a88c9b2eb70f49fb00da3dac95c /drivers/media/usb/stkwebcam/stk-sensor.c | |
parent | [media] siano: don't break long lines (diff) | |
download | kernel-qcow2-linux-b4b3f99c8d77e2edd02fdfc791c194641f3e9fc3.tar.gz kernel-qcow2-linux-b4b3f99c8d77e2edd02fdfc791c194641f3e9fc3.tar.xz kernel-qcow2-linux-b4b3f99c8d77e2edd02fdfc791c194641f3e9fc3.zip |
[media] stkwebcam: 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/stkwebcam/stk-sensor.c')
-rw-r--r-- | drivers/media/usb/stkwebcam/stk-sensor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/stkwebcam/stk-sensor.c b/drivers/media/usb/stkwebcam/stk-sensor.c index e546b014d7ad..13ad8fdf05bb 100644 --- a/drivers/media/usb/stkwebcam/stk-sensor.c +++ b/drivers/media/usb/stkwebcam/stk-sensor.c @@ -391,8 +391,8 @@ int stk_sensor_init(struct stk_camera *dev) } stk_sensor_write_regvals(dev, ov_initvals); msleep(10); - STK_INFO("OmniVision sensor detected, id %02X%02X" - " at address %x\n", idh, idl, SENSOR_ADDRESS); + STK_INFO("OmniVision sensor detected, id %02X%02X at address %x\n", + idh, idl, SENSOR_ADDRESS); return 0; } |