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

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

+14 -32
+2 -4
drivers/media/usb/dvb-usb/cinergyT2-core.c
··· 34 34 int dvb_usb_cinergyt2_debug; 35 35 36 36 module_param_named(debug, dvb_usb_cinergyt2_debug, int, 0644); 37 - MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 " 38 - "(or-able))."); 37 + MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 (or-able))."); 39 38 40 39 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 41 40 ··· 93 94 94 95 ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0); 95 96 if (ret < 0) { 96 - deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep " 97 - "state info\n"); 97 + deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n"); 98 98 } 99 99 mutex_unlock(&st->data_mutex); 100 100
+1 -4
drivers/media/usb/dvb-usb/dib0700_core.c
··· 16 16 static int nb_packet_buffer_size = 21; 17 17 module_param(nb_packet_buffer_size, int, 0644); 18 18 MODULE_PARM_DESC(nb_packet_buffer_size, 19 - "Set the dib0700 driver data buffer size. This parameter " 20 - "corresponds to the number of TS packets. The actual size of " 21 - "the data buffer corresponds to this parameter " 22 - "multiplied by 188 (default: 21)"); 19 + "Set the dib0700 driver data buffer size. This parameter corresponds to the number of TS packets. The actual size of the data buffer corresponds to this parameter multiplied by 188 (default: 21)"); 23 20 24 21 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 25 22
+1 -2
drivers/media/usb/dvb-usb/dib0700_devices.c
··· 26 26 27 27 static int force_lna_activation; 28 28 module_param(force_lna_activation, int, 0644); 29 - MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplifyer(s) (LNA), " 30 - "if applicable for the device (default: 0=automatic/off)."); 29 + MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplifyer(s) (LNA), if applicable for the device (default: 0=automatic/off)."); 31 30 32 31 struct dib0700_adapter_state { 33 32 int (*set_param_save) (struct dvb_frontend *);
+1 -2
drivers/media/usb/dvb-usb/dvb-usb-dvb.c
··· 277 277 for (i = 0; i < adap->props.num_frontends; i++) { 278 278 279 279 if (adap->props.fe[i].frontend_attach == NULL) { 280 - err("strange: '%s' #%d,%d " 281 - "doesn't want to attach a frontend.", 280 + err("strange: '%s' #%d,%d doesn't want to attach a frontend.", 282 281 adap->dev->desc->name, adap->id, i); 283 282 284 283 return 0;
+2 -4
drivers/media/usb/dvb-usb/dvb-usb-firmware.c
··· 49 49 ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len); 50 50 51 51 if (ret != hx.len) { 52 - err("error while transferring firmware " 53 - "(transferred size: %d, block size: %d)", 52 + err("error while transferring firmware (transferred size: %d, block size: %d)", 54 53 ret,hx.len); 55 54 ret = -EINVAL; 56 55 break; ··· 80 81 const struct firmware *fw = NULL; 81 82 82 83 if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) { 83 - err("did not find the firmware file. (%s) " 84 - "Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 84 + err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 85 85 props->firmware,ret); 86 86 return ret; 87 87 }
+2 -8
drivers/media/usb/dvb-usb/dw2102.c
··· 86 86 /* demod probe */ 87 87 static int demod_probe = 1; 88 88 module_param_named(demod, demod_probe, int, 0644); 89 - MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 " 90 - "4=stv0903+stb6100(or-able))."); 89 + MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 4=stv0903+stb6100(or-able))."); 91 90 92 91 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 93 92 ··· 2342 2343 module_usb_driver(dw2102_driver); 2343 2344 2344 2345 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by"); 2345 - MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104," 2346 - " DVB-C 3101 USB2.0," 2347 - " TeVii S421, S480, S482, S600, S630, S632, S650," 2348 - " TeVii S660, S662, Prof 1100, 7500 USB2.0," 2349 - " Geniatech SU3000, T220," 2350 - " TechnoTrend S2-4600, Terratec Cinergy S2 devices"); 2346 + MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101 USB2.0, TeVii S421, S480, S482, S600, S630, S632, S650, TeVii S660, S662, Prof 1100, 7500 USB2.0, Geniatech SU3000, T220, TechnoTrend S2-4600, Terratec Cinergy S2 devices"); 2351 2347 MODULE_VERSION("0.1"); 2352 2348 MODULE_LICENSE("GPL"); 2353 2349 MODULE_FIRMWARE(DW2101_FIRMWARE);
+2 -2
drivers/media/usb/dvb-usb/friio.c
··· 320 320 */ 321 321 if (rbuf[0] & 0x80) { /* still in PowerOnReset state? */ 322 322 if (++retry > 3) { 323 - deb_info("failed to get the correct" 324 - " FE demod status:0x%02x\n", rbuf[0]); 323 + deb_info("failed to get the correct FE demod status:0x%02x\n", 324 + rbuf[0]); 325 325 goto error; 326 326 } 327 327 msleep(100);
+1 -2
drivers/media/usb/dvb-usb/gp8psk.c
··· 131 131 u8 *buf; 132 132 if ((ret = request_firmware(&fw, bcm4500_firmware, 133 133 &d->udev->dev)) != 0) { 134 - err("did not find the bcm4500 firmware file. (%s) " 135 - "Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 134 + err("did not find the bcm4500 firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 136 135 bcm4500_firmware,ret); 137 136 return ret; 138 137 }
+1 -2
drivers/media/usb/dvb-usb/opera1.c
··· 453 453 info("start downloading fpga firmware %s",filename); 454 454 455 455 if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) { 456 - err("did not find the firmware file. (%s) " 457 - "Please see linux/Documentation/dvb/ for more details on firmware-problems.", 456 + err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems.", 458 457 filename); 459 458 return ret; 460 459 } else {
+1 -2
drivers/media/usb/dvb-usb/technisat-usb2.c
··· 50 50 static int disable_led_control; 51 51 module_param(disable_led_control, int, 0444); 52 52 MODULE_PARM_DESC(disable_led_control, 53 - "disable LED control of the device " 54 - "(default: 0 - LED control is active)."); 53 + "disable LED control of the device (default: 0 - LED control is active)."); 55 54 56 55 /* device private data */ 57 56 struct technisat_usb2_state {