[PATCH net-next 4/5] net: phy: cortina: Utilize generic functions

2018-02-28 Thread Florian Fainelli
cortina_soft_reset() does the same thing as gen10g_soft_reset(), and
cortina_config_aneg() is actually doing what gen10g_config_init() does
for 10G capable PHYs.

Signed-off-by: Florian Fainelli 
---
 drivers/net/phy/cortina.c | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 9442db221834..9afbeb8b3667 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -30,14 +30,6 @@ static int cortina_read_reg(struct phy_device *phydev, u16 
regnum)
MII_ADDR_C45 | regnum);
 }
 
-static int cortina_config_aneg(struct phy_device *phydev)
-{
-   phydev->supported = SUPPORTED_1baseT_Full;
-   phydev->advertising = SUPPORTED_1baseT_Full;
-
-   return 0;
-}
-
 static int cortina_read_status(struct phy_device *phydev)
 {
int gpio_int_status, ret = 0;
@@ -61,11 +53,6 @@ static int cortina_read_status(struct phy_device *phydev)
return ret;
 }
 
-static int cortina_soft_reset(struct phy_device *phydev)
-{
-   return 0;
-}
-
 static int cortina_probe(struct phy_device *phydev)
 {
u32 phy_id = 0;
@@ -101,9 +88,10 @@ static struct phy_driver cortina_driver[] = {
.phy_id = PHY_ID_CS4340,
.phy_id_mask= 0x,
.name   = "Cortina CS4340",
-   .config_aneg= cortina_config_aneg,
+   .config_init= gen10g_config_init,
+   .config_aneg= gen10g_config_aneg,
.read_status= cortina_read_status,
-   .soft_reset = cortina_soft_reset,
+   .soft_reset = gen10g_soft_reset,
.probe  = cortina_probe,
 },
 };
-- 
2.14.1



[PATCH net-next 4/5] net: phy: cortina: Utilize generic functions

2018-02-28 Thread Florian Fainelli
cortina_soft_reset() does the same thing as gen10g_soft_reset(), and
cortina_config_aneg() is actually doing what gen10g_config_init() does
for 10G capable PHYs.

Signed-off-by: Florian Fainelli 
---
 drivers/net/phy/cortina.c | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 9442db221834..9afbeb8b3667 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -30,14 +30,6 @@ static int cortina_read_reg(struct phy_device *phydev, u16 
regnum)
MII_ADDR_C45 | regnum);
 }
 
-static int cortina_config_aneg(struct phy_device *phydev)
-{
-   phydev->supported = SUPPORTED_1baseT_Full;
-   phydev->advertising = SUPPORTED_1baseT_Full;
-
-   return 0;
-}
-
 static int cortina_read_status(struct phy_device *phydev)
 {
int gpio_int_status, ret = 0;
@@ -61,11 +53,6 @@ static int cortina_read_status(struct phy_device *phydev)
return ret;
 }
 
-static int cortina_soft_reset(struct phy_device *phydev)
-{
-   return 0;
-}
-
 static int cortina_probe(struct phy_device *phydev)
 {
u32 phy_id = 0;
@@ -101,9 +88,10 @@ static struct phy_driver cortina_driver[] = {
.phy_id = PHY_ID_CS4340,
.phy_id_mask= 0x,
.name   = "Cortina CS4340",
-   .config_aneg= cortina_config_aneg,
+   .config_init= gen10g_config_init,
+   .config_aneg= gen10g_config_aneg,
.read_status= cortina_read_status,
-   .soft_reset = cortina_soft_reset,
+   .soft_reset = gen10g_soft_reset,
.probe  = cortina_probe,
 },
 };
-- 
2.14.1