[media] rc: 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>
此提交包含在:
@@ -297,8 +297,7 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
|
||||
goto out;
|
||||
}
|
||||
|
||||
snprintf(sz->name, sizeof(sz->name), "Streamzap PC Remote Infrared "
|
||||
"Receiver (%04x:%04x)",
|
||||
snprintf(sz->name, sizeof(sz->name), "Streamzap PC Remote Infrared Receiver (%04x:%04x)",
|
||||
le16_to_cpu(sz->usbdev->descriptor.idVendor),
|
||||
le16_to_cpu(sz->usbdev->descriptor.idProduct));
|
||||
usb_make_path(sz->usbdev, sz->phys, sizeof(sz->phys));
|
||||
@@ -364,15 +363,15 @@ static int streamzap_probe(struct usb_interface *intf,
|
||||
|
||||
sz->endpoint = &(iface_host->endpoint[0].desc);
|
||||
if (!usb_endpoint_dir_in(sz->endpoint)) {
|
||||
dev_err(&intf->dev, "%s: endpoint doesn't match input device "
|
||||
"02%02x\n", __func__, sz->endpoint->bEndpointAddress);
|
||||
dev_err(&intf->dev, "%s: endpoint doesn't match input device 02%02x\n",
|
||||
__func__, sz->endpoint->bEndpointAddress);
|
||||
retval = -ENODEV;
|
||||
goto free_sz;
|
||||
}
|
||||
|
||||
if (!usb_endpoint_xfer_int(sz->endpoint)) {
|
||||
dev_err(&intf->dev, "%s: endpoint attributes don't match xfer "
|
||||
"02%02x\n", __func__, sz->endpoint->bmAttributes);
|
||||
dev_err(&intf->dev, "%s: endpoint attributes don't match xfer 02%02x\n",
|
||||
__func__, sz->endpoint->bmAttributes);
|
||||
retval = -ENODEV;
|
||||
goto free_sz;
|
||||
}
|
||||
|
新增問題並參考
封鎖使用者