mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
net: drop special comment style
As we discussed in the room at netdevconf earlier this week, drop the requirement for special comment style for netdev. For checkpatch, the general check accepts both right now, so simply drop the special request there as well. Acked-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
979b581e4c
commit
82b8000c28
@ -629,18 +629,6 @@ The preferred style for long (multi-line) comments is:
|
|||||||
* with beginning and ending almost-blank lines.
|
* with beginning and ending almost-blank lines.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
For files in net/ and drivers/net/ the preferred style for long (multi-line)
|
|
||||||
comments is a little different.
|
|
||||||
|
|
||||||
.. code-block:: c
|
|
||||||
|
|
||||||
/* The preferred comment style for files in net/ and drivers/net
|
|
||||||
* looks like this.
|
|
||||||
*
|
|
||||||
* It is nearly the same as the generally preferred comment style,
|
|
||||||
* but there is no initial almost-blank line.
|
|
||||||
*/
|
|
||||||
|
|
||||||
It's also important to comment data, whether they are basic types or derived
|
It's also important to comment data, whether they are basic types or derived
|
||||||
types. To this end, use just one data declaration per line (no commas for
|
types. To this end, use just one data declaration per line (no commas for
|
||||||
multiple data declarations). This leaves you room for a small comment on each
|
multiple data declarations). This leaves you room for a small comment on each
|
||||||
|
@ -355,23 +355,6 @@ just do it. As a result, a sequence of smaller series gets merged quicker and
|
|||||||
with better review coverage. Re-posting large series also increases the mailing
|
with better review coverage. Re-posting large series also increases the mailing
|
||||||
list traffic.
|
list traffic.
|
||||||
|
|
||||||
Multi-line comments
|
|
||||||
~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Comment style convention is slightly different for networking and most of
|
|
||||||
the tree. Instead of this::
|
|
||||||
|
|
||||||
/*
|
|
||||||
* foobar blah blah blah
|
|
||||||
* another line of text
|
|
||||||
*/
|
|
||||||
|
|
||||||
it is requested that you make it look like this::
|
|
||||||
|
|
||||||
/* foobar blah blah blah
|
|
||||||
* another line of text
|
|
||||||
*/
|
|
||||||
|
|
||||||
Local variable ordering ("reverse xmas tree", "RCS")
|
Local variable ordering ("reverse xmas tree", "RCS")
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
@ -4015,16 +4015,6 @@ sub process {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Block comment styles
|
|
||||||
# Networking with an initial /*
|
|
||||||
if ($realfile =~ m@^(drivers/net/|net/)@ &&
|
|
||||||
$prevrawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
|
|
||||||
$rawline =~ /^\+[ \t]*\*/ &&
|
|
||||||
$realline > 3) { # Do not warn about the initial copyright comment block after SPDX-License-Identifier
|
|
||||||
WARN("NETWORKING_BLOCK_COMMENT_STYLE",
|
|
||||||
"networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
|
|
||||||
}
|
|
||||||
|
|
||||||
# Block comments use * on subsequent lines
|
# Block comments use * on subsequent lines
|
||||||
if ($prevline =~ /$;[ \t]*$/ && #ends in comment
|
if ($prevline =~ /$;[ \t]*$/ && #ends in comment
|
||||||
$prevrawline =~ /^\+.*?\/\*/ && #starting /*
|
$prevrawline =~ /^\+.*?\/\*/ && #starting /*
|
||||||
|
Loading…
Reference in New Issue
Block a user