diff options
author | David S. Miller <davem@davemloft.net> | 2021-06-16 12:34:08 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-06-16 12:34:08 -0700 |
commit | 63e96bc4e32811a2bc1e9172691e263e074a32ae (patch) | |
tree | 193e30a0398dd4a9170a5af2f9ffd5c1ace67e79 /drivers/net/phy/national.c | |
parent | 56a967c4f7e5fed2e66d90906ff5956abf69364a (diff) | |
parent | 16d4d650966d9a607b32ceb709248f7833d88ed0 (diff) |
Merge branch 'net-phy-cleanups'
Weihang Li says:
====================
net: phy: fix some coding-style issues
Make some cleanups according to the coding style of kernel.
Changes since v1:
- Update commit description of #1 and #3.
- Avoid changing the indentation in #2.
- Change a group of if-else statement into switch from #4 and put it into
a single patch.
- Put '|' at the end of line in #5 and #7.
- Avoid deleting spaces in definition of 'settings' in #5.
- Drop #8 from the series which needs more discussion with David.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/national.c')
-rw-r--r-- | drivers/net/phy/national.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c index 46160baaafe3..9ae9cc6b23c2 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); } |