Commit f319ed91 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[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: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ba1da97e
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
int dvb_usb_cinergyt2_debug; int dvb_usb_cinergyt2_debug;
module_param_named(debug, dvb_usb_cinergyt2_debug, int, 0644); module_param_named(debug, dvb_usb_cinergyt2_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 " MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 (or-able)).");
"(or-able)).");
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
...@@ -94,8 +93,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -94,8 +93,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0); ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0);
if (ret < 0) { if (ret < 0) {
deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep " deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n");
"state info\n");
} }
mutex_unlock(&st->data_mutex); mutex_unlock(&st->data_mutex);
......
...@@ -16,10 +16,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=fw,4=fwdata,8=data (or-ab ...@@ -16,10 +16,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=fw,4=fwdata,8=data (or-ab
static int nb_packet_buffer_size = 21; static int nb_packet_buffer_size = 21;
module_param(nb_packet_buffer_size, int, 0644); module_param(nb_packet_buffer_size, int, 0644);
MODULE_PARM_DESC(nb_packet_buffer_size, MODULE_PARM_DESC(nb_packet_buffer_size,
"Set the dib0700 driver data buffer size. This parameter " "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)");
"corresponds to the number of TS packets. The actual size of "
"the data buffer corresponds to this parameter "
"multiplied by 188 (default: 21)");
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
......
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
static int force_lna_activation; static int force_lna_activation;
module_param(force_lna_activation, int, 0644); module_param(force_lna_activation, int, 0644);
MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplifyer(s) (LNA), " MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplifyer(s) (LNA), if applicable for the device (default: 0=automatic/off).");
"if applicable for the device (default: 0=automatic/off).");
struct dib0700_adapter_state { struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *); int (*set_param_save) (struct dvb_frontend *);
......
...@@ -277,8 +277,7 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap) ...@@ -277,8 +277,7 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap)
for (i = 0; i < adap->props.num_frontends; i++) { for (i = 0; i < adap->props.num_frontends; i++) {
if (adap->props.fe[i].frontend_attach == NULL) { if (adap->props.fe[i].frontend_attach == NULL) {
err("strange: '%s' #%d,%d " err("strange: '%s' #%d,%d doesn't want to attach a frontend.",
"doesn't want to attach a frontend.",
adap->dev->desc->name, adap->id, i); adap->dev->desc->name, adap->id, i);
return 0; return 0;
......
...@@ -49,8 +49,7 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw ...@@ -49,8 +49,7 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw
ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len); ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
if (ret != hx.len) { if (ret != hx.len) {
err("error while transferring firmware " err("error while transferring firmware (transferred size: %d, block size: %d)",
"(transferred size: %d, block size: %d)",
ret,hx.len); ret,hx.len);
ret = -EINVAL; ret = -EINVAL;
break; break;
...@@ -81,8 +80,7 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_pro ...@@ -81,8 +80,7 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_pro
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) { if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) {
err("did not find the firmware file. (%s) " err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",
"Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",
props->firmware,ret); props->firmware,ret);
return ret; return ret;
} }
......
...@@ -86,8 +86,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer 4=rc(or-able))." ...@@ -86,8 +86,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer 4=rc(or-able))."
/* demod probe */ /* demod probe */
static int demod_probe = 1; static int demod_probe = 1;
module_param_named(demod, demod_probe, int, 0644); module_param_named(demod, demod_probe, int, 0644);
MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 " MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 4=stv0903+stb6100(or-able)).");
"4=stv0903+stb6100(or-able)).");
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
...@@ -2343,12 +2342,7 @@ static struct usb_driver dw2102_driver = { ...@@ -2343,12 +2342,7 @@ static struct usb_driver dw2102_driver = {
module_usb_driver(dw2102_driver); module_usb_driver(dw2102_driver);
MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by"); MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104," 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");
" 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");
MODULE_VERSION("0.1"); MODULE_VERSION("0.1");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_FIRMWARE(DW2101_FIRMWARE); MODULE_FIRMWARE(DW2101_FIRMWARE);
......
...@@ -320,8 +320,8 @@ static int friio_initialize(struct dvb_usb_device *d) ...@@ -320,8 +320,8 @@ static int friio_initialize(struct dvb_usb_device *d)
*/ */
if (rbuf[0] & 0x80) { /* still in PowerOnReset state? */ if (rbuf[0] & 0x80) { /* still in PowerOnReset state? */
if (++retry > 3) { if (++retry > 3) {
deb_info("failed to get the correct" deb_info("failed to get the correct FE demod status:0x%02x\n",
" FE demod status:0x%02x\n", rbuf[0]); rbuf[0]);
goto error; goto error;
} }
msleep(100); msleep(100);
......
...@@ -131,8 +131,7 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d) ...@@ -131,8 +131,7 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)
u8 *buf; u8 *buf;
if ((ret = request_firmware(&fw, bcm4500_firmware, if ((ret = request_firmware(&fw, bcm4500_firmware,
&d->udev->dev)) != 0) { &d->udev->dev)) != 0) {
err("did not find the bcm4500 firmware file. (%s) " err("did not find the bcm4500 firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",
"Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",
bcm4500_firmware,ret); bcm4500_firmware,ret);
return ret; return ret;
} }
......
...@@ -453,8 +453,7 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev, ...@@ -453,8 +453,7 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
info("start downloading fpga firmware %s",filename); info("start downloading fpga firmware %s",filename);
if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) { if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) {
err("did not find the firmware file. (%s) " err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems.",
"Please see linux/Documentation/dvb/ for more details on firmware-problems.",
filename); filename);
return ret; return ret;
} else { } else {
......
...@@ -50,8 +50,7 @@ MODULE_PARM_DESC(debug, ...@@ -50,8 +50,7 @@ MODULE_PARM_DESC(debug,
static int disable_led_control; static int disable_led_control;
module_param(disable_led_control, int, 0444); module_param(disable_led_control, int, 0444);
MODULE_PARM_DESC(disable_led_control, MODULE_PARM_DESC(disable_led_control,
"disable LED control of the device " "disable LED control of the device (default: 0 - LED control is active).");
"(default: 0 - LED control is active).");
/* device private data */ /* device private data */
struct technisat_usb2_state { struct technisat_usb2_state {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment