Commit 4a58d390 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] b2c2: 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 22990690
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
static int debug; static int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2," MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS);
"ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS);
#undef DEBSTATUS #undef DEBSTATUS
#define deb_info(args...) dprintk(0x01, args) #define deb_info(args...) dprintk(0x01, args)
...@@ -433,8 +432,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) ...@@ -433,8 +432,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
frame_size, i, j, ret; frame_size, i, j, ret;
int buffer_offset = 0; int buffer_offset = 0;
deb_ts("creating %d iso-urbs with %d frames " deb_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n",
"each of %d bytes size = %d.\n", B2C2_USB_NUM_ISO_URB, B2C2_USB_NUM_ISO_URB,
B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize); B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize);
fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev, fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev,
...@@ -459,8 +458,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) ...@@ -459,8 +458,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) { for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
int frame_offset = 0; int frame_offset = 0;
struct urb *urb = fc_usb->iso_urb[i]; struct urb *urb = fc_usb->iso_urb[i];
deb_ts("initializing and submitting urb no. %d " deb_ts("initializing and submitting urb no. %d (buf_offset: %d).\n",
"(buf_offset: %d).\n", i, buffer_offset); i, buffer_offset);
urb->dev = fc_usb->udev; urb->dev = fc_usb->udev;
urb->context = fc_usb; urb->context = fc_usb;
......
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