[media] soc_camera: 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>
This commit is contained in:
Родитель
4b68f05e4d
Коммит
8f44c39251
|
@ -1064,8 +1064,7 @@ static int ov772x_probe(struct i2c_client *client,
|
||||||
|
|
||||||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
|
||||||
dev_err(&adapter->dev,
|
dev_err(&adapter->dev,
|
||||||
"I2C-Adapter doesn't support "
|
"I2C-Adapter doesn't support I2C_FUNC_SMBUS_BYTE_DATA\n");
|
||||||
"I2C_FUNC_SMBUS_BYTE_DATA\n");
|
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -881,8 +881,7 @@ static int ov9740_video_probe(struct i2c_client *client)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_info(&client->dev, "ov9740 Model ID 0x%04x, Revision 0x%02x, "
|
dev_info(&client->dev, "ov9740 Model ID 0x%04x, Revision 0x%02x, Manufacturer 0x%02x, SMIA Version 0x%02x\n",
|
||||||
"Manufacturer 0x%02x, SMIA Version 0x%02x\n",
|
|
||||||
priv->model, priv->revision, priv->manid, priv->smiaver);
|
priv->model, priv->revision, priv->manid, priv->smiaver);
|
||||||
|
|
||||||
ret = v4l2_ctrl_handler_setup(&priv->hdl);
|
ret = v4l2_ctrl_handler_setup(&priv->hdl);
|
||||||
|
|
|
@ -947,8 +947,7 @@ static int tw9910_probe(struct i2c_client *client,
|
||||||
|
|
||||||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
|
||||||
dev_err(&client->dev,
|
dev_err(&client->dev,
|
||||||
"I2C-Adapter doesn't support "
|
"I2C-Adapter doesn't support I2C_FUNC_SMBUS_BYTE_DATA\n");
|
||||||
"I2C_FUNC_SMBUS_BYTE_DATA\n");
|
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче