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/sfp.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/sfp.c')
| -rw-r--r-- | drivers/net/phy/sfp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 37f722c763d7..34e90216bd2c 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -2153,7 +2153,7 @@ static void sfp_sm_main(struct sfp *sfp, unsigned int event) case SFP_S_INIT: if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) { - /* TX_FAULT is still asserted after t_init or + /* TX_FAULT is still asserted after t_init * or t_start_up, so assume there is a fault. */ sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, |