summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/phy/mscc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 857725aca7e4..a3e1f7569539 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -317,7 +317,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
u8 sd;
u16 vdd;
int rc, i, j;
- struct device *dev = &phydev->mdio.dev;
+ struct device *dev = &phydev->dev;
struct device_node *of_node = dev->of_node;
u8 sd_array_size = ARRAY_SIZE(edge_table[0].slowdown);
@@ -345,7 +345,7 @@ static int vsc85xx_dt_led_mode_get(struct phy_device *phydev,
char *led,
u8 default_mode)
{
- struct device *dev = &phydev->mdio.dev;
+ struct device *dev = &phydev->dev;
struct device_node *of_node = dev->of_node;
u8 led_mode;
int err;
@@ -441,7 +441,7 @@ static int vsc85xx_default_config(struct phy_device *phydev)
int rc;
u16 reg_val;
- phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+ phydev->mdix = ETH_TP_MDI_AUTO;
mutex_lock(&phydev->lock);
rc = vsc85xx_phy_page_set(phydev, MSCC_PHY_PAGE_EXTENDED_2);
if (rc != 0)
@@ -534,7 +534,7 @@ static int vsc85xx_config_aneg(struct phy_device *phydev)
{
int rc;
- rc = vsc85xx_mdix_set(phydev, phydev->mdix_ctrl);
+ rc = vsc85xx_mdix_set(phydev, phydev->mdix);
if (rc < 0)
return rc;
@@ -562,7 +562,7 @@ static int vsc85xx_probe(struct phy_device *phydev)
if (rate_magic < 0)
return rate_magic;
- vsc8531 = devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL);
+ vsc8531 = devm_kzalloc(&phydev->dev, sizeof(*vsc8531), GFP_KERNEL);
if (!vsc8531)
return -ENOMEM;