| Message ID | 1623393419-2521-3-git-send-email-liweihang@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phy: fix some coding-style issues | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: linux@armlinux.org.uk |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 75 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Fri, Jun 11, 2021 at 02:36:53PM +0800, Weihang Li wrote: > 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--); Please indicate in the commit message why you changed the indentation. Andrew
On 2021/6/11 22:36, Andrew Lunn wrote: > On Fri, Jun 11, 2021 at 02:36:53PM +0800, Weihang Li wrote: >> 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--); > > Please indicate in the commit message why you changed the indentation. > > Andrew > Sure, thanks. Weihang
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;