Commit 52358dd6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: phy: remove function stubs 



All callers of these functions depend on PHYLIB or select it directly
or indirectly by selecting PHYLINK. Stubs make sense for optional
functionality, but that's not the case here.

MDIO_XGENE usually is selected by NET_XGENE which also selects PHYLIB.
Add a dependency to PHYLIB nevertheless, in order not to break
randconfig builds.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/f7a69a1f-60e9-4ac0-8b7c-481e0cc850e7@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f0cc3777

drivers/net/mdio/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ config MDIO_SUN4I 
config MDIO_XGENE

	tristate "APM X-Gene SoC MDIO bus controller"

	depends on ARCH_XGENE || COMPILE_TEST

	depends on PHYLIB

	help

	  This module provides a driver for the MDIO busses found in the

	  APM X-Gene SoC's.

include/linux/phy.h

+0 −37
Original line number Diff line number Diff line
@@ -1753,7 +1753,6 @@ int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum, 
struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,

				     bool is_c45,

				     struct phy_c45_device_ids *c45_ids);

#if IS_ENABLED(CONFIG_PHYLIB)

int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id);

struct mdio_device *fwnode_mdio_find_device(struct fwnode_handle *fwnode);

struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode);
@@ -1761,42 +1760,6 @@ struct fwnode_handle *fwnode_get_phy_node(const struct fwnode_handle *fwnode); 
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);

int phy_device_register(struct phy_device *phy);

void phy_device_free(struct phy_device *phydev);

#else

static inline int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id)

{

	return 0;

}

static inline

struct mdio_device *fwnode_mdio_find_device(struct fwnode_handle *fwnode)

{

	return 0;

}



static inline

struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode)

{

	return NULL;

}



static inline

struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode)

{

	return NULL;

}



static inline

struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)

{

	return NULL;

}



static inline int phy_device_register(struct phy_device *phy)

{

	return 0;

}



static inline void phy_device_free(struct phy_device *phydev) { }

#endif /* CONFIG_PHYLIB */

void phy_device_remove(struct phy_device *phydev);

int phy_get_c45_ids(struct phy_device *phydev);

int phy_init_hw(struct phy_device *phydev);