> Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com> > --- > drivers/net/phy/marvell10g.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c > index e5d098bd33a6..765edd34a7dd 100644 > --- a/drivers/net/phy/marvell10g.c > +++ b/drivers/net/phy/marvell10g.c > @@ -245,17 +245,8 @@ static int mv3310_probe(struct phy_device *phydev) > if (ret) > return ret; > > - return 0; > -} > - > -static int mv3310_suspend(struct phy_device *phydev) > -{ > - return 0; > -} > - > -static int mv3310_resume(struct phy_device *phydev) > -{ > - return mv3310_hwmon_config(phydev, true);
Hi Antoine I'm confused. Didn't patch 1 just add suspend and resume callback? And here you are removing some other suspend and resume callbacks? Did we have two sets for a short while? Andrew