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/davicom.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/davicom.c')
| -rw-r--r-- | drivers/net/phy/davicom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index a3b3842c67e5..4ac4bce1bf32 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -43,10 +43,10 @@ #define MII_DM9161_INTR_DPLX_CHANGE 0x0010 #define MII_DM9161_INTR_SPD_CHANGE 0x0008 #define MII_DM9161_INTR_LINK_CHANGE 0x0004 -#define MII_DM9161_INTR_INIT 0x0000 +#define MII_DM9161_INTR_INIT 0x0000 #define MII_DM9161_INTR_STOP \ -(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \ - | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) + (MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK | \ + MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) #define MII_DM9161_INTR_CHANGE \ (MII_DM9161_INTR_DPLX_CHANGE | \ MII_DM9161_INTR_SPD_CHANGE | \ |