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/ste10Xp.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/ste10Xp.c')
| -rw-r--r-- | drivers/net/phy/ste10Xp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c index 431fe5e0ce31..309e4c3496c4 100644 --- a/drivers/net/phy/ste10Xp.c +++ b/drivers/net/phy/ste10Xp.c @@ -20,12 +20,12 @@ #include <linux/mii.h> #include <linux/phy.h> -#define MII_XCIIS 0x11 /* Configuration Info IRQ & Status Reg */ -#define MII_XIE 0x12 /* Interrupt Enable Register */ +#define MII_XCIIS 0x11 /* Configuration Info IRQ & Status Reg */ +#define MII_XIE 0x12 /* Interrupt Enable Register */ #define MII_XIE_DEFAULT_MASK 0x0070 /* ANE complete, Remote Fault, Link Down */ #define STE101P_PHY_ID 0x00061c50 -#define STE100P_PHY_ID 0x1c040011 +#define STE100P_PHY_ID 0x1c040011 static int ste10Xp_config_init(struct phy_device *phydev) { |