From: Weihang Li <liweihang@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <andrew@lunn.ch>,
<hkallweit1@gmail.com>
Cc: <netdev@vger.kernel.org>, <linuxarm@huawei.com>,
Wenpeng Liang <liangwenpeng@huawei.com>,
Weihang Li <liweihang@huawei.com>
Subject: [PATCH net-next 2/8] net: phy: correct format of block comments
Date: Fri, 11 Jun 2021 14:36:53 +0800 [thread overview]
Message-ID: <1623393419-2521-3-git-send-email-liweihang@huawei.com> (raw)
In-Reply-To: <1623393419-2521-1-git-send-email-liweihang@huawei.com>
From: Wenpeng Liang <liangwenpeng@huawei.com>
Block comments should not use a trailing */ on a separate line and every
line of a block comment should start with an '*'.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/lxt.c | 6 +++---
drivers/net/phy/national.c | 6 ++++--
drivers/net/phy/phy-core.c | 3 ++-
drivers/net/phy/phylink.c | 9 ++++++---
drivers/net/phy/vitesse.c | 3 ++-
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index bde3356..5e00910 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -241,9 +241,9 @@ static int lxt973a2_read_status(struct phy_device *phydev)
if (lpa < 0)
return lpa;
- /* If both registers are equal, it is suspect but not
- * impossible, hence a new try
- */
+ /* If both registers are equal, it is suspect but not
+ * impossible, hence a new try
+ */
} while (lpa == adv && retry--);
mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 46160ba..9ae9cc6b 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -68,7 +68,8 @@ static int ns_ack_interrupt(struct phy_device *phydev)
return ret;
/* Clear the interrupt status bit by writing a “1”
- * to the corresponding bit in INT_CLEAR (2:0 are reserved) */
+ * to the corresponding bit in INT_CLEAR (2:0 are reserved)
+ */
ret = phy_write(phydev, DP83865_INT_CLEAR, ret & ~0x7);
return ret;
@@ -150,7 +151,8 @@ static int ns_config_init(struct phy_device *phydev)
{
ns_giga_speed_fallback(phydev, ALL_FALLBACK_ON);
/* In the latest MAC or switches design, the 10 Mbps loopback
- is desired to be turned off. */
+ * is desired to be turned off.
+ */
ns_10_base_t_hdx_loopack(phydev, hdx_loopback_off);
return ns_ack_interrupt(phydev);
}
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 8d333d3..2870c33 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -76,7 +76,8 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str);
/* A mapping of all SUPPORTED settings to speed/duplex. This table
* must be grouped by speed and sorted in descending match priority
- * - iow, descending speed. */
+ * - iow, descending speed.
+ */
#define PHY_SETTING(s, d, b) { .speed = SPEED_ ## s, .duplex = DUPLEX_ ## d, \
.bit = ETHTOOL_LINK_MODE_ ## b ## _BIT}
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 96d8e88..9baaa34 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -181,7 +181,8 @@ static int phylink_parse_fixedlink(struct phylink *pl,
pl->link_config.duplex = DUPLEX_FULL;
/* We treat the "pause" and "asym-pause" terminology as
- * defining the link partner's ability. */
+ * defining the link partner's ability.
+ */
if (fwnode_property_read_bool(fixed_node, "pause"))
__set_bit(ETHTOOL_LINK_MODE_Pause_BIT,
pl->link_config.lp_advertising);
@@ -679,7 +680,8 @@ static void phylink_resolve(struct work_struct *w)
phylink_mac_pcs_get_state(pl, &link_state);
/* If we have a phy, the "up" state is the union of
- * both the PHY and the MAC */
+ * both the PHY and the MAC
+ */
if (pl->phydev)
link_state.link &= pl->phy_state.link;
@@ -688,7 +690,8 @@ static void phylink_resolve(struct work_struct *w)
link_state.interface = pl->phy_state.interface;
/* If we have a PHY, we need to update with
- * the PHY flow control bits. */
+ * the PHY flow control bits.
+ */
link_state.pause = pl->phy_state.pause;
mac_config = true;
}
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 16704e2..897b979 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -249,7 +249,8 @@ static int vsc73xx_config_aneg(struct phy_device *phydev)
/* This adds a skew for both TX and RX clocks, so the skew should only be
* applied to "rgmii-id" interfaces. It may not work as expected
- * on "rgmii-txid", "rgmii-rxid" or "rgmii" interfaces. */
+ * on "rgmii-txid", "rgmii-rxid" or "rgmii" interfaces.
+ */
static int vsc8601_add_skew(struct phy_device *phydev)
{
int ret;
--
2.8.1
next prev parent reply other threads:[~2021-06-11 6:40 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 6:36 [PATCH net-next 0/8] net: phy: fix some coding-style issues Weihang Li
2021-06-11 6:36 ` [PATCH net-next 1/8] net: phy: add a blank line after declarations Weihang Li
2021-06-11 14:31 ` Andrew Lunn
2021-06-15 6:12 ` liweihang
2021-06-11 6:36 ` Weihang Li [this message]
2021-06-11 14:36 ` [PATCH net-next 2/8] net: phy: correct format of block comments Andrew Lunn
2021-06-15 6:18 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 3/8] net: phy: delete repeated word " Weihang Li
2021-06-11 14:39 ` Andrew Lunn
2021-06-15 6:21 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 4/8] net: phy: fixed formatting issues with braces Weihang Li
2021-06-11 14:41 ` Andrew Lunn
2021-06-16 6:39 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 5/8] net: phy: fixed space alignment issues Weihang Li
2021-06-11 15:30 ` Andrew Lunn
2021-06-15 6:24 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 6/8] net: phy: print the function name by __func__ instead of an fixed string Weihang Li
2021-06-11 16:05 ` Andrew Lunn
2021-06-15 6:26 ` liweihang
2021-06-16 8:14 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 7/8] net: phy: remove unnecessary line continuation Weihang Li
2021-06-11 16:06 ` Andrew Lunn
2021-06-15 6:26 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 8/8] net: phy: use '__packed' instead of '__attribute__((__packed__))' Weihang Li
2021-06-11 16:07 ` Andrew Lunn
2021-06-14 14:28 ` David Laight
2021-06-16 6:17 ` liweihang
2021-06-16 8:47 ` David Laight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1623393419-2521-3-git-send-email-liweihang@huawei.com \
--to=liweihang@huawei.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=liangwenpeng@huawei.com \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).