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

[media] dvb-usb-v2: 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 f319ed91
...@@ -666,8 +666,8 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state, ...@@ -666,8 +666,8 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state,
if (rd_status[i] == 0x04) { if (rd_status[i] == 0x04) {
if (i < 7) { if (i < 7) {
mxl_i2c("i2c fifo empty!" mxl_i2c("i2c fifo empty! @ %d",
" @ %d", i); i);
msg->buf[(index*8)+i] = msg->buf[(index*8)+i] =
i2c_r_data[(i*3)+1]; i2c_r_data[(i*3)+1];
/* read again */ /* read again */
...@@ -692,8 +692,7 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state, ...@@ -692,8 +692,7 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state,
} }
goto stop_copy; goto stop_copy;
} else { } else {
mxl_i2c("readagain " mxl_i2c("readagain ERROR!");
"ERROR!");
} }
} else { } else {
msg->buf[(index*8)+i] = msg->buf[(index*8)+i] =
...@@ -827,9 +826,8 @@ int mxl111sf_i2c_xfer(struct i2c_adapter *adap, ...@@ -827,9 +826,8 @@ int mxl111sf_i2c_xfer(struct i2c_adapter *adap,
mxl111sf_i2c_hw_xfer_msg(state, &msg[i]) : mxl111sf_i2c_hw_xfer_msg(state, &msg[i]) :
mxl111sf_i2c_sw_xfer_msg(state, &msg[i]); mxl111sf_i2c_sw_xfer_msg(state, &msg[i]);
if (mxl_fail(ret)) { if (mxl_fail(ret)) {
mxl_debug_adv("failed with error %d on i2c " mxl_debug_adv("failed with error %d on i2c transaction %d of %d, %sing %d bytes to/from 0x%02x",
"transaction %d of %d, %sing %d bytes " ret, i+1, num,
"to/from 0x%02x", ret, i+1, num,
(msg[i].flags & I2C_M_RD) ? (msg[i].flags & I2C_M_RD) ?
"read" : "writ", "read" : "writ",
msg[i].len, msg[i].addr); msg[i].len, msg[i].addr);
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
int dvb_usb_mxl111sf_debug; int dvb_usb_mxl111sf_debug;
module_param_named(debug, dvb_usb_mxl111sf_debug, int, 0644); module_param_named(debug, dvb_usb_mxl111sf_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level " MODULE_PARM_DESC(debug, "set debugging level (1=info, 2=xfer, 4=i2c, 8=reg, 16=adv (or-able)).");
"(1=info, 2=xfer, 4=i2c, 8=reg, 16=adv (or-able)).");
static int dvb_usb_mxl111sf_isoc; static int dvb_usb_mxl111sf_isoc;
module_param_named(isoc, dvb_usb_mxl111sf_isoc, int, 0644); module_param_named(isoc, dvb_usb_mxl111sf_isoc, int, 0644);
...@@ -137,8 +136,8 @@ int mxl111sf_write_reg_mask(struct mxl111sf_state *state, ...@@ -137,8 +136,8 @@ int mxl111sf_write_reg_mask(struct mxl111sf_state *state,
#if 1 #if 1
/* dont know why this usually errors out on the first try */ /* dont know why this usually errors out on the first try */
if (mxl_fail(ret)) if (mxl_fail(ret))
pr_err("error writing addr: 0x%02x, mask: 0x%02x, " pr_err("error writing addr: 0x%02x, mask: 0x%02x, data: 0x%02x, retrying...",
"data: 0x%02x, retrying...", addr, mask, data); addr, mask, data);
ret = mxl111sf_read_reg(state, addr, &val); ret = mxl111sf_read_reg(state, addr, &val);
#endif #endif
...@@ -946,8 +945,7 @@ static int mxl111sf_init(struct dvb_usb_device *d) ...@@ -946,8 +945,7 @@ static int mxl111sf_init(struct dvb_usb_device *d)
case 138001: case 138001:
break; break;
default: default:
printk(KERN_WARNING "%s: warning: " printk(KERN_WARNING "%s: warning: unknown hauppauge model #%d\n",
"unknown hauppauge model #%d\n",
__func__, state->tv.model); __func__, state->tv.model);
} }
#endif #endif
......
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