Re: [PATCH net-next 5/5] net: phy: marvell10g: Utilize gen10g_soft_reset()

Russell King
2018-02-28T19:45:03Z

On Wed, Feb 28, 2018 at 11:36:12AM -0800, Florian Fainelli wrote:
> We do the same thing as the generic function: nothing, so utilize it.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> drivers/net/phy/marvell10g.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
> index 8a0bd98fdec7..da014eae1476 100644
> --- a/drivers/net/phy/marvell10g.c
> +++ b/drivers/net/phy/marvell10g.c
> @@ -75,11 +75,6 @@ static int mv3310_probe(struct phy_device *phydev)
> * Resetting the MV88X3310 causes it to become non-responsive. Avoid
> * setting the reset bit(s).
> */
> -static int mv3310_soft_reset(struct phy_device *phydev)
> -{
> - return 0;
> -}
> -

You do realise that getting rid of that function makes a nonsense of the
comment above it - and removing the comment along with the function gets
rid of the very important reason _why_ we have en empty reset method?

> static int mv3310_config_init(struct phy_device *phydev)
> {
> __ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };
> @@ -377,7 +372,7 @@ static struct phy_driver mv3310_drivers[] = {
> SUPPORTED_10000baseT_Full |
> SUPPORTED_Backplane,
> .probe = mv3310_probe,
> - .soft_reset = mv3310_soft_reset,
> + .soft_reset = gen10g_soft_reset,
> .config_init = mv3310_config_init,
> .config_aneg = mv3310_config_aneg,
> .aneg_done = mv3310_aneg_done,
> --
> 2.14.1
>

--
Russell King
ARM architecture Linux Kernel maintainer