---
  drivers/net/phy/phylink.c | 3 ++-
  drivers/net/phy/sfp-bus.c | 4 ++--
  include/linux/sfp.h       | 2 +-
  3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 51c526d227fa..ab4e9fc03017 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c

@@ -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);
  }

diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 2f44fc51848f..56953e66bb7b 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c

@@ -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);

diff --git a/include/linux/sfp.h b/include/linux/sfp.h
index b14be59550e3..54abb4d22b2e 100644
--- a/include/linux/sfp.h
+++ b/include/linux/sfp.h

@@ -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)