Hi Andrew, On Thu, Feb 28, 2019 at 03:22:43PM +0100, Andrew Lunn wrote: > > 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); > > > 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?
Indeed. I just check and what happened is I initially had the suspend/resume callbacks implementation and this patch into the same patch. And then I made a mistake when splitting them, leaving two suspend/resume functions, and I did not see that when reviewing the series... Sorry about that, I'll fix it! Thanks, Antoine -- Antoine Ténart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com