Skip to content

Commit

Permalink
net: phy: cortina: Utilize generic functions
Browse files Browse the repository at this point in the history
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 <f.fainelli@gmail.com>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Mar 2, 2018
1 parent aebc78a commit 0adfdb6
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions drivers/net/phy/cortina.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_10000baseT_Full;
phydev->advertising = SUPPORTED_10000baseT_Full;

return 0;
}

static int cortina_read_status(struct phy_device *phydev)
{
int gpio_int_status, ret = 0;
Expand All @@ -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;
Expand Down Expand Up @@ -101,9 +88,10 @@ static struct phy_driver cortina_driver[] = {
.phy_id = PHY_ID_CS4340,
.phy_id_mask = 0xffffffff,
.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_no_soft_reset,
.probe = cortina_probe,
},
};
Expand Down

0 comments on commit 0adfdb6

Please sign in to comment.