Commit 4d76f115 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: sfp: pass the phy_device when disconnecting an sfp module's PHY 



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: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38496878

drivers/net/phy/phylink.c

+2 −1
Original line number Diff line number Diff line
@@ -3423,7 +3423,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) 
	return ret;

}



static void phylink_sfp_disconnect_phy(void *upstream)

static void phylink_sfp_disconnect_phy(void *upstream,

				       struct phy_device *phydev)

{

	phylink_disconnect_phy(upstream);

}

drivers/net/phy/sfp-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus) 
			bus->socket_ops->stop(bus->sfp);

		bus->socket_ops->detach(bus->sfp);

		if (bus->phydev && ops && ops->disconnect_phy)

			ops->disconnect_phy(bus->upstream);

			ops->disconnect_phy(bus->upstream, bus->phydev);

	}

	bus->registered = false;

}
@@ -743,7 +743,7 @@ void sfp_remove_phy(struct sfp_bus *bus) 
	const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);



	if (ops && ops->disconnect_phy)

		ops->disconnect_phy(bus->upstream);

		ops->disconnect_phy(bus->upstream, bus->phydev);

	bus->phydev = NULL;

}

EXPORT_SYMBOL_GPL(sfp_remove_phy);

include/linux/sfp.h

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ struct sfp_upstream_ops { 
	void (*link_down)(void *priv);

	void (*link_up)(void *priv);

	int (*connect_phy)(void *priv, struct phy_device *);

	void (*disconnect_phy)(void *priv);

	void (*disconnect_phy)(void *priv, struct phy_device *);

};



#if IS_ENABLED(CONFIG_SFP)