| Message ID | 1623393419-2521-6-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: 1 this patch: 1 |
| 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, 262 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
> (MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \ > - | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) > + | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) The convention is to put the | at the end of the line. So (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 | \ > diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c > index 2870c33..c8d8ef8 100644 > --- a/drivers/net/phy/phy-core.c > +++ b/drivers/net/phy/phy-core.c > @@ -84,98 +84,98 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str); > > static const struct phy_setting settings[] = { > /* 400G */ > - PHY_SETTING( 400000, FULL, 400000baseCR8_Full ), > - PHY_SETTING( 400000, FULL, 400000baseKR8_Full ), > - PHY_SETTING( 400000, FULL, 400000baseLR8_ER8_FR8_Full ), > - PHY_SETTING( 400000, FULL, 400000baseDR8_Full ), > - PHY_SETTING( 400000, FULL, 400000baseSR8_Full ), > - PHY_SETTING( 400000, FULL, 400000baseCR4_Full ), > - PHY_SETTING( 400000, FULL, 400000baseKR4_Full ), > - PHY_SETTING( 400000, FULL, 400000baseLR4_ER4_FR4_Full ), > - PHY_SETTING( 400000, FULL, 400000baseDR4_Full ), > - PHY_SETTING( 400000, FULL, 400000baseSR4_Full ), > + PHY_SETTING(400000, FULL, 400000baseCR8_Full), > + PHY_SETTING(400000, FULL, 400000baseKR8_Full), > + PHY_SETTING(400000, FULL, 400000baseLR8_ER8_FR8_Full), > + PHY_SETTING(400000, FULL, 400000baseDR8_Full), > + PHY_SETTING(400000, FULL, 400000baseSR8_Full), > + PHY_SETTING(400000, FULL, 400000baseCR4_Full), > + PHY_SETTING(400000, FULL, 400000baseKR4_Full), > + PHY_SETTING(400000, FULL, 400000baseLR4_ER4_FR4_Full), > + PHY_SETTING(400000, FULL, 400000baseDR4_Full), > + PHY_SETTING(400000, FULL, 400000baseSR4_Full), > /* 200G */ > - PHY_SETTING( 200000, FULL, 200000baseCR4_Full ), > - PHY_SETTING( 200000, FULL, 200000baseKR4_Full ), > - PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full ), > - PHY_SETTING( 200000, FULL, 200000baseDR4_Full ), > - PHY_SETTING( 200000, FULL, 200000baseSR4_Full ), > - PHY_SETTING( 200000, FULL, 200000baseCR2_Full ), > - PHY_SETTING( 200000, FULL, 200000baseKR2_Full ), > - PHY_SETTING( 200000, FULL, 200000baseLR2_ER2_FR2_Full ), > - PHY_SETTING( 200000, FULL, 200000baseDR2_Full ), > - PHY_SETTING( 200000, FULL, 200000baseSR2_Full ), > + PHY_SETTING(200000, FULL, 200000baseCR4_Full), > + PHY_SETTING(200000, FULL, 200000baseKR4_Full), > + PHY_SETTING(200000, FULL, 200000baseLR4_ER4_FR4_Full), > + PHY_SETTING(200000, FULL, 200000baseDR4_Full), > + PHY_SETTING(200000, FULL, 200000baseSR4_Full), > + PHY_SETTING(200000, FULL, 200000baseCR2_Full), > + PHY_SETTING(200000, FULL, 200000baseKR2_Full), > + PHY_SETTING(200000, FULL, 200000baseLR2_ER2_FR2_Full), > + PHY_SETTING(200000, FULL, 200000baseDR2_Full), > + PHY_SETTING(200000, FULL, 200000baseSR2_Full), > /* 100G */ > - PHY_SETTING( 100000, FULL, 100000baseCR4_Full ), > - PHY_SETTING( 100000, FULL, 100000baseKR4_Full ), > - PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full ), > - PHY_SETTING( 100000, FULL, 100000baseSR4_Full ), > - PHY_SETTING( 100000, FULL, 100000baseCR2_Full ), > - PHY_SETTING( 100000, FULL, 100000baseKR2_Full ), > - PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full ), > - PHY_SETTING( 100000, FULL, 100000baseDR2_Full ), > - PHY_SETTING( 100000, FULL, 100000baseSR2_Full ), > - PHY_SETTING( 100000, FULL, 100000baseCR_Full ), > - PHY_SETTING( 100000, FULL, 100000baseKR_Full ), > - PHY_SETTING( 100000, FULL, 100000baseLR_ER_FR_Full ), > - PHY_SETTING( 100000, FULL, 100000baseDR_Full ), > - PHY_SETTING( 100000, FULL, 100000baseSR_Full ), > + PHY_SETTING(100000, FULL, 100000baseCR4_Full), > + PHY_SETTING(100000, FULL, 100000baseKR4_Full), > + PHY_SETTING(100000, FULL, 100000baseLR4_ER4_Full), > + PHY_SETTING(100000, FULL, 100000baseSR4_Full), > + PHY_SETTING(100000, FULL, 100000baseCR2_Full), > + PHY_SETTING(100000, FULL, 100000baseKR2_Full), > + PHY_SETTING(100000, FULL, 100000baseLR2_ER2_FR2_Full), > + PHY_SETTING(100000, FULL, 100000baseDR2_Full), > + PHY_SETTING(100000, FULL, 100000baseSR2_Full), > + PHY_SETTING(100000, FULL, 100000baseCR_Full), > + PHY_SETTING(100000, FULL, 100000baseKR_Full), > + PHY_SETTING(100000, FULL, 100000baseLR_ER_FR_Full), > + PHY_SETTING(100000, FULL, 100000baseDR_Full), > + PHY_SETTING(100000, FULL, 100000baseSR_Full), > /* 56G */ > - PHY_SETTING( 56000, FULL, 56000baseCR4_Full ), > - PHY_SETTING( 56000, FULL, 56000baseKR4_Full ), > - PHY_SETTING( 56000, FULL, 56000baseLR4_Full ), > - PHY_SETTING( 56000, FULL, 56000baseSR4_Full ), > + PHY_SETTING(56000, FULL, 56000baseCR4_Full), > + PHY_SETTING(56000, FULL, 56000baseKR4_Full), > + PHY_SETTING(56000, FULL, 56000baseLR4_Full), > + PHY_SETTING(56000, FULL, 56000baseSR4_Full), > /* 50G */ > - PHY_SETTING( 50000, FULL, 50000baseCR2_Full ), > - PHY_SETTING( 50000, FULL, 50000baseKR2_Full ), > - PHY_SETTING( 50000, FULL, 50000baseSR2_Full ), > - PHY_SETTING( 50000, FULL, 50000baseCR_Full ), > - PHY_SETTING( 50000, FULL, 50000baseKR_Full ), > - PHY_SETTING( 50000, FULL, 50000baseLR_ER_FR_Full ), > - PHY_SETTING( 50000, FULL, 50000baseDR_Full ), > - PHY_SETTING( 50000, FULL, 50000baseSR_Full ), > + PHY_SETTING(50000, FULL, 50000baseCR2_Full), > + PHY_SETTING(50000, FULL, 50000baseKR2_Full), > + PHY_SETTING(50000, FULL, 50000baseSR2_Full), > + PHY_SETTING(50000, FULL, 50000baseCR_Full), > + PHY_SETTING(50000, FULL, 50000baseKR_Full), > + PHY_SETTING(50000, FULL, 50000baseLR_ER_FR_Full), > + PHY_SETTING(50000, FULL, 50000baseDR_Full), > + PHY_SETTING(50000, FULL, 50000baseSR_Full), > /* 40G */ > - PHY_SETTING( 40000, FULL, 40000baseCR4_Full ), > - PHY_SETTING( 40000, FULL, 40000baseKR4_Full ), > - PHY_SETTING( 40000, FULL, 40000baseLR4_Full ), > - PHY_SETTING( 40000, FULL, 40000baseSR4_Full ), > + PHY_SETTING(40000, FULL, 40000baseCR4_Full), > + PHY_SETTING(40000, FULL, 40000baseKR4_Full), > + PHY_SETTING(40000, FULL, 40000baseLR4_Full), > + PHY_SETTING(40000, FULL, 40000baseSR4_Full), > /* 25G */ > - PHY_SETTING( 25000, FULL, 25000baseCR_Full ), > - PHY_SETTING( 25000, FULL, 25000baseKR_Full ), > - PHY_SETTING( 25000, FULL, 25000baseSR_Full ), > + PHY_SETTING(25000, FULL, 25000baseCR_Full), > + PHY_SETTING(25000, FULL, 25000baseKR_Full), > + PHY_SETTING(25000, FULL, 25000baseSR_Full), > /* 20G */ > - PHY_SETTING( 20000, FULL, 20000baseKR2_Full ), > - PHY_SETTING( 20000, FULL, 20000baseMLD2_Full ), > + PHY_SETTING(20000, FULL, 20000baseKR2_Full), > + PHY_SETTING(20000, FULL, 20000baseMLD2_Full), > /* 10G */ > - PHY_SETTING( 10000, FULL, 10000baseCR_Full ), > - PHY_SETTING( 10000, FULL, 10000baseER_Full ), > - PHY_SETTING( 10000, FULL, 10000baseKR_Full ), > - PHY_SETTING( 10000, FULL, 10000baseKX4_Full ), > - PHY_SETTING( 10000, FULL, 10000baseLR_Full ), > - PHY_SETTING( 10000, FULL, 10000baseLRM_Full ), > - PHY_SETTING( 10000, FULL, 10000baseR_FEC ), > - PHY_SETTING( 10000, FULL, 10000baseSR_Full ), > - PHY_SETTING( 10000, FULL, 10000baseT_Full ), > + PHY_SETTING(10000, FULL, 10000baseCR_Full), > + PHY_SETTING(10000, FULL, 10000baseER_Full), > + PHY_SETTING(10000, FULL, 10000baseKR_Full), > + PHY_SETTING(10000, FULL, 10000baseKX4_Full), > + PHY_SETTING(10000, FULL, 10000baseLR_Full), > + PHY_SETTING(10000, FULL, 10000baseLRM_Full), > + PHY_SETTING(10000, FULL, 10000baseR_FEC), > + PHY_SETTING(10000, FULL, 10000baseSR_Full), > + PHY_SETTING(10000, FULL, 10000baseT_Full), > /* 5G */ > - PHY_SETTING( 5000, FULL, 5000baseT_Full ), > + PHY_SETTING(5000, FULL, 5000baseT_Full), > /* 2.5G */ > - PHY_SETTING( 2500, FULL, 2500baseT_Full ), > - PHY_SETTING( 2500, FULL, 2500baseX_Full ), > + PHY_SETTING(2500, FULL, 2500baseT_Full), > + PHY_SETTING(2500, FULL, 2500baseX_Full), > /* 1G */ > - PHY_SETTING( 1000, FULL, 1000baseKX_Full ), > - PHY_SETTING( 1000, FULL, 1000baseT_Full ), > - PHY_SETTING( 1000, HALF, 1000baseT_Half ), > - PHY_SETTING( 1000, FULL, 1000baseT1_Full ), > - PHY_SETTING( 1000, FULL, 1000baseX_Full ), > + PHY_SETTING(1000, FULL, 1000baseKX_Full), > + PHY_SETTING(1000, FULL, 1000baseT_Full), > + PHY_SETTING(1000, HALF, 1000baseT_Half), > + PHY_SETTING(1000, FULL, 1000baseT1_Full), > + PHY_SETTING(1000, FULL, 1000baseX_Full), > /* 100M */ > - PHY_SETTING( 100, FULL, 100baseT_Full ), > - PHY_SETTING( 100, FULL, 100baseT1_Full ), > - PHY_SETTING( 100, HALF, 100baseT_Half ), > - PHY_SETTING( 100, HALF, 100baseFX_Half ), > - PHY_SETTING( 100, FULL, 100baseFX_Full ), > + PHY_SETTING(100, FULL, 100baseT_Full), > + PHY_SETTING(100, FULL, 100baseT1_Full), > + PHY_SETTING(100, HALF, 100baseT_Half), > + PHY_SETTING(100, HALF, 100baseFX_Half), > + PHY_SETTING(100, FULL, 100baseFX_Full), > /* 10M */ > - PHY_SETTING( 10, FULL, 10baseT_Full ), > - PHY_SETTING( 10, HALF, 10baseT_Half ), > + PHY_SETTING(10, FULL, 10baseT_Full), > + PHY_SETTING(10, HALF, 10baseT_Half), Please do not change this. It is a deliberate design decision to add these spaces here. Andrew
On 2021/6/11 23:30, Andrew Lunn wrote: >> (MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \ >> - | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) >> + | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK) > > The convention is to put the | at the end of the line. So > > (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 | \ >> diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c >> index 2870c33..c8d8ef8 100644 >> --- a/drivers/net/phy/phy-core.c >> +++ b/drivers/net/phy/phy-core.c >> @@ -84,98 +84,98 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str); > > >> >> static const struct phy_setting settings[] = { >> /* 400G */ >> - PHY_SETTING( 400000, FULL, 400000baseCR8_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseKR8_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseLR8_ER8_FR8_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseDR8_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseSR8_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseCR4_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseKR4_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseLR4_ER4_FR4_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseDR4_Full ), >> - PHY_SETTING( 400000, FULL, 400000baseSR4_Full ), >> + PHY_SETTING(400000, FULL, 400000baseCR8_Full), >> + PHY_SETTING(400000, FULL, 400000baseKR8_Full), >> + PHY_SETTING(400000, FULL, 400000baseLR8_ER8_FR8_Full), >> + PHY_SETTING(400000, FULL, 400000baseDR8_Full), >> + PHY_SETTING(400000, FULL, 400000baseSR8_Full), >> + PHY_SETTING(400000, FULL, 400000baseCR4_Full), >> + PHY_SETTING(400000, FULL, 400000baseKR4_Full), >> + PHY_SETTING(400000, FULL, 400000baseLR4_ER4_FR4_Full), >> + PHY_SETTING(400000, FULL, 400000baseDR4_Full), >> + PHY_SETTING(400000, FULL, 400000baseSR4_Full), >> /* 200G */ >> - PHY_SETTING( 200000, FULL, 200000baseCR4_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseKR4_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseDR4_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseSR4_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseCR2_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseKR2_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseLR2_ER2_FR2_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseDR2_Full ), >> - PHY_SETTING( 200000, FULL, 200000baseSR2_Full ), >> + PHY_SETTING(200000, FULL, 200000baseCR4_Full), >> + PHY_SETTING(200000, FULL, 200000baseKR4_Full), >> + PHY_SETTING(200000, FULL, 200000baseLR4_ER4_FR4_Full), >> + PHY_SETTING(200000, FULL, 200000baseDR4_Full), >> + PHY_SETTING(200000, FULL, 200000baseSR4_Full), >> + PHY_SETTING(200000, FULL, 200000baseCR2_Full), >> + PHY_SETTING(200000, FULL, 200000baseKR2_Full), >> + PHY_SETTING(200000, FULL, 200000baseLR2_ER2_FR2_Full), >> + PHY_SETTING(200000, FULL, 200000baseDR2_Full), >> + PHY_SETTING(200000, FULL, 200000baseSR2_Full), >> /* 100G */ >> - PHY_SETTING( 100000, FULL, 100000baseCR4_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseKR4_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseSR4_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseCR2_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseKR2_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseDR2_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseSR2_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseCR_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseKR_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseLR_ER_FR_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseDR_Full ), >> - PHY_SETTING( 100000, FULL, 100000baseSR_Full ), >> + PHY_SETTING(100000, FULL, 100000baseCR4_Full), >> + PHY_SETTING(100000, FULL, 100000baseKR4_Full), >> + PHY_SETTING(100000, FULL, 100000baseLR4_ER4_Full), >> + PHY_SETTING(100000, FULL, 100000baseSR4_Full), >> + PHY_SETTING(100000, FULL, 100000baseCR2_Full), >> + PHY_SETTING(100000, FULL, 100000baseKR2_Full), >> + PHY_SETTING(100000, FULL, 100000baseLR2_ER2_FR2_Full), >> + PHY_SETTING(100000, FULL, 100000baseDR2_Full), >> + PHY_SETTING(100000, FULL, 100000baseSR2_Full), >> + PHY_SETTING(100000, FULL, 100000baseCR_Full), >> + PHY_SETTING(100000, FULL, 100000baseKR_Full), >> + PHY_SETTING(100000, FULL, 100000baseLR_ER_FR_Full), >> + PHY_SETTING(100000, FULL, 100000baseDR_Full), >> + PHY_SETTING(100000, FULL, 100000baseSR_Full), >> /* 56G */ >> - PHY_SETTING( 56000, FULL, 56000baseCR4_Full ), >> - PHY_SETTING( 56000, FULL, 56000baseKR4_Full ), >> - PHY_SETTING( 56000, FULL, 56000baseLR4_Full ), >> - PHY_SETTING( 56000, FULL, 56000baseSR4_Full ), >> + PHY_SETTING(56000, FULL, 56000baseCR4_Full), >> + PHY_SETTING(56000, FULL, 56000baseKR4_Full), >> + PHY_SETTING(56000, FULL, 56000baseLR4_Full), >> + PHY_SETTING(56000, FULL, 56000baseSR4_Full), >> /* 50G */ >> - PHY_SETTING( 50000, FULL, 50000baseCR2_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseKR2_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseSR2_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseCR_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseKR_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseLR_ER_FR_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseDR_Full ), >> - PHY_SETTING( 50000, FULL, 50000baseSR_Full ), >> + PHY_SETTING(50000, FULL, 50000baseCR2_Full), >> + PHY_SETTING(50000, FULL, 50000baseKR2_Full), >> + PHY_SETTING(50000, FULL, 50000baseSR2_Full), >> + PHY_SETTING(50000, FULL, 50000baseCR_Full), >> + PHY_SETTING(50000, FULL, 50000baseKR_Full), >> + PHY_SETTING(50000, FULL, 50000baseLR_ER_FR_Full), >> + PHY_SETTING(50000, FULL, 50000baseDR_Full), >> + PHY_SETTING(50000, FULL, 50000baseSR_Full), >> /* 40G */ >> - PHY_SETTING( 40000, FULL, 40000baseCR4_Full ), >> - PHY_SETTING( 40000, FULL, 40000baseKR4_Full ), >> - PHY_SETTING( 40000, FULL, 40000baseLR4_Full ), >> - PHY_SETTING( 40000, FULL, 40000baseSR4_Full ), >> + PHY_SETTING(40000, FULL, 40000baseCR4_Full), >> + PHY_SETTING(40000, FULL, 40000baseKR4_Full), >> + PHY_SETTING(40000, FULL, 40000baseLR4_Full), >> + PHY_SETTING(40000, FULL, 40000baseSR4_Full), >> /* 25G */ >> - PHY_SETTING( 25000, FULL, 25000baseCR_Full ), >> - PHY_SETTING( 25000, FULL, 25000baseKR_Full ), >> - PHY_SETTING( 25000, FULL, 25000baseSR_Full ), >> + PHY_SETTING(25000, FULL, 25000baseCR_Full), >> + PHY_SETTING(25000, FULL, 25000baseKR_Full), >> + PHY_SETTING(25000, FULL, 25000baseSR_Full), >> /* 20G */ >> - PHY_SETTING( 20000, FULL, 20000baseKR2_Full ), >> - PHY_SETTING( 20000, FULL, 20000baseMLD2_Full ), >> + PHY_SETTING(20000, FULL, 20000baseKR2_Full), >> + PHY_SETTING(20000, FULL, 20000baseMLD2_Full), >> /* 10G */ >> - PHY_SETTING( 10000, FULL, 10000baseCR_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseER_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseKR_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseKX4_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseLR_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseLRM_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseR_FEC ), >> - PHY_SETTING( 10000, FULL, 10000baseSR_Full ), >> - PHY_SETTING( 10000, FULL, 10000baseT_Full ), >> + PHY_SETTING(10000, FULL, 10000baseCR_Full), >> + PHY_SETTING(10000, FULL, 10000baseER_Full), >> + PHY_SETTING(10000, FULL, 10000baseKR_Full), >> + PHY_SETTING(10000, FULL, 10000baseKX4_Full), >> + PHY_SETTING(10000, FULL, 10000baseLR_Full), >> + PHY_SETTING(10000, FULL, 10000baseLRM_Full), >> + PHY_SETTING(10000, FULL, 10000baseR_FEC), >> + PHY_SETTING(10000, FULL, 10000baseSR_Full), >> + PHY_SETTING(10000, FULL, 10000baseT_Full), >> /* 5G */ >> - PHY_SETTING( 5000, FULL, 5000baseT_Full ), >> + PHY_SETTING(5000, FULL, 5000baseT_Full), >> /* 2.5G */ >> - PHY_SETTING( 2500, FULL, 2500baseT_Full ), >> - PHY_SETTING( 2500, FULL, 2500baseX_Full ), >> + PHY_SETTING(2500, FULL, 2500baseT_Full), >> + PHY_SETTING(2500, FULL, 2500baseX_Full), >> /* 1G */ >> - PHY_SETTING( 1000, FULL, 1000baseKX_Full ), >> - PHY_SETTING( 1000, FULL, 1000baseT_Full ), >> - PHY_SETTING( 1000, HALF, 1000baseT_Half ), >> - PHY_SETTING( 1000, FULL, 1000baseT1_Full ), >> - PHY_SETTING( 1000, FULL, 1000baseX_Full ), >> + PHY_SETTING(1000, FULL, 1000baseKX_Full), >> + PHY_SETTING(1000, FULL, 1000baseT_Full), >> + PHY_SETTING(1000, HALF, 1000baseT_Half), >> + PHY_SETTING(1000, FULL, 1000baseT1_Full), >> + PHY_SETTING(1000, FULL, 1000baseX_Full), >> /* 100M */ >> - PHY_SETTING( 100, FULL, 100baseT_Full ), >> - PHY_SETTING( 100, FULL, 100baseT1_Full ), >> - PHY_SETTING( 100, HALF, 100baseT_Half ), >> - PHY_SETTING( 100, HALF, 100baseFX_Half ), >> - PHY_SETTING( 100, FULL, 100baseFX_Full ), >> + PHY_SETTING(100, FULL, 100baseT_Full), >> + PHY_SETTING(100, FULL, 100baseT1_Full), >> + PHY_SETTING(100, HALF, 100baseT_Half), >> + PHY_SETTING(100, HALF, 100baseFX_Half), >> + PHY_SETTING(100, FULL, 100baseFX_Full), >> /* 10M */ >> - PHY_SETTING( 10, FULL, 10baseT_Full ), >> - PHY_SETTING( 10, HALF, 10baseT_Half ), >> + PHY_SETTING(10, FULL, 10baseT_Full), >> + PHY_SETTING(10, HALF, 10baseT_Half), > > Please do not change this. It is a deliberate design decision to add > these spaces here. > > Andrew > OK, I will drop this part from this patch, thank you. Weihang
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index a3b3842c6..23aed41 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_LINK_MASK | MII_DM9161_INTR_MASK) #define MII_DM9161_INTR_CHANGE \ (MII_DM9161_INTR_DPLX_CHANGE | \ MII_DM9161_INTR_SPD_CHANGE | \ diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 2870c33..c8d8ef8 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -84,98 +84,98 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str); static const struct phy_setting settings[] = { /* 400G */ - PHY_SETTING( 400000, FULL, 400000baseCR8_Full ), - PHY_SETTING( 400000, FULL, 400000baseKR8_Full ), - PHY_SETTING( 400000, FULL, 400000baseLR8_ER8_FR8_Full ), - PHY_SETTING( 400000, FULL, 400000baseDR8_Full ), - PHY_SETTING( 400000, FULL, 400000baseSR8_Full ), - PHY_SETTING( 400000, FULL, 400000baseCR4_Full ), - PHY_SETTING( 400000, FULL, 400000baseKR4_Full ), - PHY_SETTING( 400000, FULL, 400000baseLR4_ER4_FR4_Full ), - PHY_SETTING( 400000, FULL, 400000baseDR4_Full ), - PHY_SETTING( 400000, FULL, 400000baseSR4_Full ), + PHY_SETTING(400000, FULL, 400000baseCR8_Full), + PHY_SETTING(400000, FULL, 400000baseKR8_Full), + PHY_SETTING(400000, FULL, 400000baseLR8_ER8_FR8_Full), + PHY_SETTING(400000, FULL, 400000baseDR8_Full), + PHY_SETTING(400000, FULL, 400000baseSR8_Full), + PHY_SETTING(400000, FULL, 400000baseCR4_Full), + PHY_SETTING(400000, FULL, 400000baseKR4_Full), + PHY_SETTING(400000, FULL, 400000baseLR4_ER4_FR4_Full), + PHY_SETTING(400000, FULL, 400000baseDR4_Full), + PHY_SETTING(400000, FULL, 400000baseSR4_Full), /* 200G */ - PHY_SETTING( 200000, FULL, 200000baseCR4_Full ), - PHY_SETTING( 200000, FULL, 200000baseKR4_Full ), - PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full ), - PHY_SETTING( 200000, FULL, 200000baseDR4_Full ), - PHY_SETTING( 200000, FULL, 200000baseSR4_Full ), - PHY_SETTING( 200000, FULL, 200000baseCR2_Full ), - PHY_SETTING( 200000, FULL, 200000baseKR2_Full ), - PHY_SETTING( 200000, FULL, 200000baseLR2_ER2_FR2_Full ), - PHY_SETTING( 200000, FULL, 200000baseDR2_Full ), - PHY_SETTING( 200000, FULL, 200000baseSR2_Full ), + PHY_SETTING(200000, FULL, 200000baseCR4_Full), + PHY_SETTING(200000, FULL, 200000baseKR4_Full), + PHY_SETTING(200000, FULL, 200000baseLR4_ER4_FR4_Full), + PHY_SETTING(200000, FULL, 200000baseDR4_Full), + PHY_SETTING(200000, FULL, 200000baseSR4_Full), + PHY_SETTING(200000, FULL, 200000baseCR2_Full), + PHY_SETTING(200000, FULL, 200000baseKR2_Full), + PHY_SETTING(200000, FULL, 200000baseLR2_ER2_FR2_Full), + PHY_SETTING(200000, FULL, 200000baseDR2_Full), + PHY_SETTING(200000, FULL, 200000baseSR2_Full), /* 100G */ - PHY_SETTING( 100000, FULL, 100000baseCR4_Full ), - PHY_SETTING( 100000, FULL, 100000baseKR4_Full ), - PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full ), - PHY_SETTING( 100000, FULL, 100000baseSR4_Full ), - PHY_SETTING( 100000, FULL, 100000baseCR2_Full ), - PHY_SETTING( 100000, FULL, 100000baseKR2_Full ), - PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full ), - PHY_SETTING( 100000, FULL, 100000baseDR2_Full ), - PHY_SETTING( 100000, FULL, 100000baseSR2_Full ), - PHY_SETTING( 100000, FULL, 100000baseCR_Full ), - PHY_SETTING( 100000, FULL, 100000baseKR_Full ), - PHY_SETTING( 100000, FULL, 100000baseLR_ER_FR_Full ), - PHY_SETTING( 100000, FULL, 100000baseDR_Full ), - PHY_SETTING( 100000, FULL, 100000baseSR_Full ), + PHY_SETTING(100000, FULL, 100000baseCR4_Full), + PHY_SETTING(100000, FULL, 100000baseKR4_Full), + PHY_SETTING(100000, FULL, 100000baseLR4_ER4_Full), + PHY_SETTING(100000, FULL, 100000baseSR4_Full), + PHY_SETTING(100000, FULL, 100000baseCR2_Full), + PHY_SETTING(100000, FULL, 100000baseKR2_Full), + PHY_SETTING(100000, FULL, 100000baseLR2_ER2_FR2_Full), + PHY_SETTING(100000, FULL, 100000baseDR2_Full), + PHY_SETTING(100000, FULL, 100000baseSR2_Full), + PHY_SETTING(100000, FULL, 100000baseCR_Full), + PHY_SETTING(100000, FULL, 100000baseKR_Full), + PHY_SETTING(100000, FULL, 100000baseLR_ER_FR_Full), + PHY_SETTING(100000, FULL, 100000baseDR_Full), + PHY_SETTING(100000, FULL, 100000baseSR_Full), /* 56G */ - PHY_SETTING( 56000, FULL, 56000baseCR4_Full ), - PHY_SETTING( 56000, FULL, 56000baseKR4_Full ), - PHY_SETTING( 56000, FULL, 56000baseLR4_Full ), - PHY_SETTING( 56000, FULL, 56000baseSR4_Full ), + PHY_SETTING(56000, FULL, 56000baseCR4_Full), + PHY_SETTING(56000, FULL, 56000baseKR4_Full), + PHY_SETTING(56000, FULL, 56000baseLR4_Full), + PHY_SETTING(56000, FULL, 56000baseSR4_Full), /* 50G */ - PHY_SETTING( 50000, FULL, 50000baseCR2_Full ), - PHY_SETTING( 50000, FULL, 50000baseKR2_Full ), - PHY_SETTING( 50000, FULL, 50000baseSR2_Full ), - PHY_SETTING( 50000, FULL, 50000baseCR_Full ), - PHY_SETTING( 50000, FULL, 50000baseKR_Full ), - PHY_SETTING( 50000, FULL, 50000baseLR_ER_FR_Full ), - PHY_SETTING( 50000, FULL, 50000baseDR_Full ), - PHY_SETTING( 50000, FULL, 50000baseSR_Full ), + PHY_SETTING(50000, FULL, 50000baseCR2_Full), + PHY_SETTING(50000, FULL, 50000baseKR2_Full), + PHY_SETTING(50000, FULL, 50000baseSR2_Full), + PHY_SETTING(50000, FULL, 50000baseCR_Full), + PHY_SETTING(50000, FULL, 50000baseKR_Full), + PHY_SETTING(50000, FULL, 50000baseLR_ER_FR_Full), + PHY_SETTING(50000, FULL, 50000baseDR_Full), + PHY_SETTING(50000, FULL, 50000baseSR_Full), /* 40G */ - PHY_SETTING( 40000, FULL, 40000baseCR4_Full ), - PHY_SETTING( 40000, FULL, 40000baseKR4_Full ), - PHY_SETTING( 40000, FULL, 40000baseLR4_Full ), - PHY_SETTING( 40000, FULL, 40000baseSR4_Full ), + PHY_SETTING(40000, FULL, 40000baseCR4_Full), + PHY_SETTING(40000, FULL, 40000baseKR4_Full), + PHY_SETTING(40000, FULL, 40000baseLR4_Full), + PHY_SETTING(40000, FULL, 40000baseSR4_Full), /* 25G */ - PHY_SETTING( 25000, FULL, 25000baseCR_Full ), - PHY_SETTING( 25000, FULL, 25000baseKR_Full ), - PHY_SETTING( 25000, FULL, 25000baseSR_Full ), + PHY_SETTING(25000, FULL, 25000baseCR_Full), + PHY_SETTING(25000, FULL, 25000baseKR_Full), + PHY_SETTING(25000, FULL, 25000baseSR_Full), /* 20G */ - PHY_SETTING( 20000, FULL, 20000baseKR2_Full ), - PHY_SETTING( 20000, FULL, 20000baseMLD2_Full ), + PHY_SETTING(20000, FULL, 20000baseKR2_Full), + PHY_SETTING(20000, FULL, 20000baseMLD2_Full), /* 10G */ - PHY_SETTING( 10000, FULL, 10000baseCR_Full ), - PHY_SETTING( 10000, FULL, 10000baseER_Full ), - PHY_SETTING( 10000, FULL, 10000baseKR_Full ), - PHY_SETTING( 10000, FULL, 10000baseKX4_Full ), - PHY_SETTING( 10000, FULL, 10000baseLR_Full ), - PHY_SETTING( 10000, FULL, 10000baseLRM_Full ), - PHY_SETTING( 10000, FULL, 10000baseR_FEC ), - PHY_SETTING( 10000, FULL, 10000baseSR_Full ), - PHY_SETTING( 10000, FULL, 10000baseT_Full ), + PHY_SETTING(10000, FULL, 10000baseCR_Full), + PHY_SETTING(10000, FULL, 10000baseER_Full), + PHY_SETTING(10000, FULL, 10000baseKR_Full), + PHY_SETTING(10000, FULL, 10000baseKX4_Full), + PHY_SETTING(10000, FULL, 10000baseLR_Full), + PHY_SETTING(10000, FULL, 10000baseLRM_Full), + PHY_SETTING(10000, FULL, 10000baseR_FEC), + PHY_SETTING(10000, FULL, 10000baseSR_Full), + PHY_SETTING(10000, FULL, 10000baseT_Full), /* 5G */ - PHY_SETTING( 5000, FULL, 5000baseT_Full ), + PHY_SETTING(5000, FULL, 5000baseT_Full), /* 2.5G */ - PHY_SETTING( 2500, FULL, 2500baseT_Full ), - PHY_SETTING( 2500, FULL, 2500baseX_Full ), + PHY_SETTING(2500, FULL, 2500baseT_Full), + PHY_SETTING(2500, FULL, 2500baseX_Full), /* 1G */ - PHY_SETTING( 1000, FULL, 1000baseKX_Full ), - PHY_SETTING( 1000, FULL, 1000baseT_Full ), - PHY_SETTING( 1000, HALF, 1000baseT_Half ), - PHY_SETTING( 1000, FULL, 1000baseT1_Full ), - PHY_SETTING( 1000, FULL, 1000baseX_Full ), + PHY_SETTING(1000, FULL, 1000baseKX_Full), + PHY_SETTING(1000, FULL, 1000baseT_Full), + PHY_SETTING(1000, HALF, 1000baseT_Half), + PHY_SETTING(1000, FULL, 1000baseT1_Full), + PHY_SETTING(1000, FULL, 1000baseX_Full), /* 100M */ - PHY_SETTING( 100, FULL, 100baseT_Full ), - PHY_SETTING( 100, FULL, 100baseT1_Full ), - PHY_SETTING( 100, HALF, 100baseT_Half ), - PHY_SETTING( 100, HALF, 100baseFX_Half ), - PHY_SETTING( 100, FULL, 100baseFX_Full ), + PHY_SETTING(100, FULL, 100baseT_Full), + PHY_SETTING(100, FULL, 100baseT1_Full), + PHY_SETTING(100, HALF, 100baseT_Half), + PHY_SETTING(100, HALF, 100baseFX_Half), + PHY_SETTING(100, FULL, 100baseFX_Full), /* 10M */ - PHY_SETTING( 10, FULL, 10baseT_Full ), - PHY_SETTING( 10, HALF, 10baseT_Half ), + PHY_SETTING(10, FULL, 10baseT_Full), + PHY_SETTING(10, HALF, 10baseT_Half), }; #undef PHY_SETTING diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index e61de66..fe23fd3 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -624,14 +624,14 @@ static void sfp_upstream_clear(struct sfp_bus *bus) * be put via sfp_bus_put() when done. * * Returns: - * - on success, a pointer to the sfp_bus structure, - * - %NULL if no SFP is specified, - * - on failure, an error pointer value: + * - on success, a pointer to the sfp_bus structure, + * - %NULL if no SFP is specified, + * - on failure, an error pointer value: * - * - corresponding to the errors detailed for - * fwnode_property_get_reference_args(). - * - %-ENOMEM if we failed to allocate the bus. - * - an error from the upstream's connect_phy() method. + * - corresponding to the errors detailed for + * fwnode_property_get_reference_args(). + * - %-ENOMEM if we failed to allocate the bus. + * - an error from the upstream's connect_phy() method. */ struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode) { @@ -666,14 +666,14 @@ EXPORT_SYMBOL_GPL(sfp_bus_find_fwnode); * bus, so it is safe to put the bus after this call. * * Returns: - * - on success, a pointer to the sfp_bus structure, - * - %NULL if no SFP is specified, - * - on failure, an error pointer value: + * - on success, a pointer to the sfp_bus structure, + * - %NULL if no SFP is specified, + * - on failure, an error pointer value: * - * - corresponding to the errors detailed for - * fwnode_property_get_reference_args(). - * - %-ENOMEM if we failed to allocate the bus. - * - an error from the upstream's connect_phy() method. + * - corresponding to the errors detailed for + * fwnode_property_get_reference_args(). + * - %-ENOMEM if we failed to allocate the bus. + * - an error from the upstream's connect_phy() method. */ int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, const struct sfp_upstream_ops *ops) diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c index ca49c1a..8b5445a 100644 --- a/drivers/net/phy/spi_ks8995.c +++ b/drivers/net/phy/spi_ks8995.c @@ -160,11 +160,11 @@ static const struct spi_device_id ks8995_id[] = { MODULE_DEVICE_TABLE(spi, ks8995_id); static const struct of_device_id ks8895_spi_of_match[] = { - { .compatible = "micrel,ks8995" }, - { .compatible = "micrel,ksz8864" }, - { .compatible = "micrel,ksz8795" }, - { }, - }; + { .compatible = "micrel,ks8995" }, + { .compatible = "micrel,ksz8864" }, + { .compatible = "micrel,ksz8795" }, + { }, +}; MODULE_DEVICE_TABLE(of, ks8895_spi_of_match); static inline u8 get_chip_id(u8 val) diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c index 431fe5e..309e4c3 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) {