[PATCH net-next v5 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY

[Maxime Chevallier]

Hi Russell,

On Wed, 3 Jan 2024 15:20:25 +0000
"Russell King (Oracle)" <linux at armlinux.org.uk> wrote:

> On Thu, Dec 21, 2023 at 07:00:35PM +0100, Maxime Chevallier wrote:
> > Pass the phy_device as a parameter to the sfp upstream .disconnect_phy
> > operation. This is preparatory work to help track phy devices across
> > a net_device's link.
> > 
> > Signed-off-by: Maxime Chevallier <maxime.chevallier at bootlin.com>
> > ---
> > V5: No changes
> > V4: No changes
> > V3: No changes
> > 
> >  drivers/net/phy/phy_device.c | 8 ++++++++
> >  drivers/net/phy/phylink.c    | 3 ++-
> >  drivers/net/phy/sfp-bus.c    | 4 ++--
> >  include/linux/sfp.h          | 2 +-
> >  4 files changed, 13 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> > index d7c0812bd107..aad78e3f7894 100644
> > --- a/drivers/net/phy/phy_device.c
> > +++ b/drivers/net/phy/phy_device.c
> > @@ -266,6 +266,14 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev)
> >  
> >  static struct phy_driver genphy_driver;
> >  
> > +static struct phy_link_topology *phy_get_link_topology(struct phy_device *phydev)
> > +{
> > +	if (phydev->attached_dev)
> > +		return &phydev->attached_dev->link_topo;
> > +
> > +	return NULL;
> > +}
> > +
> >  static LIST_HEAD(phy_fixup_list);
> >  static DEFINE_MUTEX(phy_fixup_lock);
> >    
> 
> This should be in a different patch, it seems unrelated to the remainder
> of this patch, and as it's static and no other changes to this file,
> this would cause a build warning.

Arg looks like I squashed that bit here to the wrong commit while
rebasing, it should have been part of commit 03/13 indeed... Sorry for
the hiccup.

Maxime