Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: phy: Export gen10g_* functions 



In order to remove a fair amount of duplication in the different 10G PHY
drivers, export all gen10g_* functions to be able to make use of those.
While we are at it, rename gen10g_soft_reset() to gen10g_no_soft_reset()
to illustrate what it does.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 6ed33d3a

drivers/net/phy/phy-c45.c

+13 −7
Original line number Original line Diff line number Diff line
@@ -268,12 +268,13 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_mdix); 




/* The gen10g_* functions are the old Clause 45 stub */

/* The gen10g_* functions are the old Clause 45 stub */





static int gen10g_config_aneg(struct phy_device *phydev)

int gen10g_config_aneg(struct phy_device *phydev)

{

{

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_config_aneg);





static int gen10g_read_status(struct phy_device *phydev)

int gen10g_read_status(struct phy_device *phydev)

{

{

	u32 mmd_mask = phydev->c45_ids.devices_in_package;

	u32 mmd_mask = phydev->c45_ids.devices_in_package;

	int ret;

	int ret;
@@ -291,14 +292,16 @@ static int gen10g_read_status(struct phy_device *phydev) 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_read_status);





static int gen10g_soft_reset(struct phy_device *phydev)

int gen10g_no_soft_reset(struct phy_device *phydev)

{

{

	/* Do nothing for now */

	/* Do nothing for now */

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_no_soft_reset);





static int gen10g_config_init(struct phy_device *phydev)

int gen10g_config_init(struct phy_device *phydev)

{

{

	/* Temporarily just say we support everything */

	/* Temporarily just say we support everything */

	phydev->supported = SUPPORTED_10000baseT_Full;

	phydev->supported = SUPPORTED_10000baseT_Full;
@@ -306,22 +309,25 @@ static int gen10g_config_init(struct phy_device *phydev) 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_config_init);





static int gen10g_suspend(struct phy_device *phydev)

int gen10g_suspend(struct phy_device *phydev)

{

{

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_suspend);





static int gen10g_resume(struct phy_device *phydev)

int gen10g_resume(struct phy_device *phydev)

{

{

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(gen10g_resume);





struct phy_driver genphy_10g_driver = {

struct phy_driver genphy_10g_driver = {

	.phy_id         = 0xffffffff,

	.phy_id         = 0xffffffff,

	.phy_id_mask    = 0xffffffff,

	.phy_id_mask    = 0xffffffff,

	.name           = "Generic 10G PHY",

	.name           = "Generic 10G PHY",

	.soft_reset	= gen10g_soft_reset,

	.soft_reset	= gen10g_no_soft_reset,

	.config_init    = gen10g_config_init,

	.config_init    = gen10g_config_init,

	.features       = 0,

	.features       = 0,

	.config_aneg    = gen10g_config_aneg,

	.config_aneg    = gen10g_config_aneg,

include/linux/phy.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -994,6 +994,14 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev); 
int genphy_c45_an_disable_aneg(struct phy_device *phydev);

int genphy_c45_an_disable_aneg(struct phy_device *phydev);

int genphy_c45_read_mdix(struct phy_device *phydev);

int genphy_c45_read_mdix(struct phy_device *phydev);





/* The gen10g_* functions are the old Clause 45 stub */

int gen10g_config_aneg(struct phy_device *phydev);

int gen10g_read_status(struct phy_device *phydev);

int gen10g_no_soft_reset(struct phy_device *phydev);

int gen10g_config_init(struct phy_device *phydev);

int gen10g_suspend(struct phy_device *phydev);

int gen10g_resume(struct phy_device *phydev);



static inline int phy_read_status(struct phy_device *phydev)

static inline int phy_read_status(struct phy_device *phydev)

{

{

	if (!phydev->drv)

	if (!phydev->drv)