Commit 96313e1d authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: mdio: Remove of_phy_attach() 



We have no in-tree users, also update the sfp-phylink.rst documentation
to indicate that phy_attach_direct() is used instead of of_phy_attach().

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59756555

Documentation/networking/sfp-phylink.rst

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ this documentation. 
	err = phylink_of_phy_connect(priv->phylink, node, flags);



   For the most part, ``flags`` can be zero; these flags are passed to

   the of_phy_attach() inside this function call if a PHY is specified

   the phy_attach_direct() inside this function call if a PHY is specified

   in the DT node ``node``.



   ``node`` should be the DT node which contains the network phy property,

drivers/net/mdio/of_mdio.c

+0 −30
Original line number Diff line number Diff line
@@ -462,36 +462,6 @@ struct phy_device *of_phy_get_and_connect(struct net_device *dev, 
}

EXPORT_SYMBOL(of_phy_get_and_connect);



/**

 * of_phy_attach - Attach to a PHY without starting the state machine

 * @dev: pointer to net_device claiming the phy

 * @phy_np: Node pointer for the PHY

 * @flags: flags to pass to the PHY

 * @iface: PHY data interface type

 *

 * If successful, returns a pointer to the phy_device with the embedded

 * struct device refcount incremented by one, or NULL on failure. The

 * refcount must be dropped by calling phy_disconnect() or phy_detach().

 */

struct phy_device *of_phy_attach(struct net_device *dev,

				 struct device_node *phy_np, u32 flags,

				 phy_interface_t iface)

{

	struct phy_device *phy = of_phy_find_device(phy_np);

	int ret;



	if (!phy)

		return NULL;



	ret = phy_attach_direct(dev, phy, flags, iface);



	/* refcount is held by phy_attach_direct() on success */

	put_device(&phy->mdio.dev);



	return ret ? NULL : phy;

}

EXPORT_SYMBOL(of_phy_attach);



/*

 * of_phy_is_fixed_link() and of_phy_register_fixed_link() must

 * support two DT bindings:

include/linux/of_mdio.h

+0 −10
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ of_phy_connect(struct net_device *dev, struct device_node *phy_np, 
struct phy_device *

of_phy_get_and_connect(struct net_device *dev, struct device_node *np,

		       void (*hndlr)(struct net_device *));

struct phy_device *

of_phy_attach(struct net_device *dev, struct device_node *phy_np,

	      u32 flags, phy_interface_t iface);



struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);

int of_phy_register_fixed_link(struct device_node *np);
@@ -100,13 +97,6 @@ of_phy_get_and_connect(struct net_device *dev, struct device_node *np, 
	return NULL;

}



static inline struct phy_device *of_phy_attach(struct net_device *dev,

					       struct device_node *phy_np,

					       u32 flags, phy_interface_t iface)

{

	return NULL;

}



static inline struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np)

{

	return NULL;