Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] radio: 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>

+3 -8
+2 -6
drivers/media/radio/radio-gemtek.c
··· 67 67 MODULE_PARM_DESC(probe, "Enable automatic device probing."); 68 68 69 69 module_param(hardmute, bool, 0644); 70 - MODULE_PARM_DESC(hardmute, "Enable 'hard muting' by shutting down PLL, may " 71 - "reduce static noise."); 70 + MODULE_PARM_DESC(hardmute, "Enable 'hard muting' by shutting down PLL, may reduce static noise."); 72 71 73 72 module_param_array(io, int, NULL, 0444); 74 - MODULE_PARM_DESC(io, "Force I/O ports for the GemTek Radio card if automatic " 75 - "probing is disabled or fails. The most common I/O ports are: 0x20c " 76 - "0x30c, 0x24c or 0x34c (0x20c, 0x248 and 0x28c have been reported to " 77 - "work for the combined sound/radiocard)."); 73 + MODULE_PARM_DESC(io, "Force I/O ports for the GemTek Radio card if automatic probing is disabled or fails. The most common I/O ports are: 0x20c 0x30c, 0x24c or 0x34c (0x20c, 0x248 and 0x28c have been reported to work for the combined sound/radiocard)."); 78 74 79 75 module_param_array(radio_nr, int, NULL, 0444); 80 76 MODULE_PARM_DESC(radio_nr, "Radio device numbers");
+1 -2
drivers/media/radio/radio-wl1273.c
··· 2068 2068 goto err_request_irq; 2069 2069 } 2070 2070 } else { 2071 - dev_err(radio->dev, WL1273_FM_DRIVER_NAME ": Core WL1273 IRQ" 2072 - " not configured"); 2071 + dev_err(radio->dev, WL1273_FM_DRIVER_NAME ": Core WL1273 IRQ not configured"); 2073 2072 r = -EINVAL; 2074 2073 goto pdata_err; 2075 2074 }