diff --git a/drivers/net/dsa/mxl862xx/mxl862xx.c b/drivers/net/dsa/mxl862xx/mxl862xx.c
index b1e2094b5816..8281c749967a 100644
--- a/drivers/net/dsa/mxl862xx/mxl862xx.c
+++ b/drivers/net/dsa/mxl862xx/mxl862xx.c
@@ -44,13 +44,13 @@ static enum dsa_tag_protocol mxl862xx_get_tag_protocol(struct dsa_switch *ds,
 }
 
 /* PHY access via firmware relay */
-static int mxl862xx_phy_read_mmd(struct mxl862xx_priv *priv, int port,
-				 int devadd, int reg)
+static int mxl862xx_phy_read_mmd(struct mxl862xx_priv *priv, int addr,
+				 int devadd, int regnum)
 {
 	struct mdio_relay_data param = {
-		.phy = port,
+		.phy = addr,
 		.mmd = devadd,
-		.reg = cpu_to_le16(reg),
+		.reg = cpu_to_le16(regnum),
 	};
 	int ret;
 
@@ -61,40 +61,40 @@ static int mxl862xx_phy_read_mmd(struct mxl862xx_priv *priv, int port,
 	return le16_to_cpu(param.data);
 }
 
-static int mxl862xx_phy_write_mmd(struct mxl862xx_priv *priv, int port,
-				  int devadd, int reg, u16 data)
+static int mxl862xx_phy_write_mmd(struct mxl862xx_priv *priv, int addr,
+				  int devadd, int regnum, u16 data)
 {
 	struct mdio_relay_data param = {
-		.phy = port,
+		.phy = addr,
 		.mmd = devadd,
-		.reg = cpu_to_le16(reg),
+		.reg = cpu_to_le16(regnum),
 		.data = cpu_to_le16(data),
 	};
 
 	return MXL862XX_API_WRITE(priv, INT_GPHY_WRITE, param);
 }
 
-static int mxl862xx_phy_read_mii_bus(struct mii_bus *bus, int port, int regnum)
+static int mxl862xx_phy_read_mii_bus(struct mii_bus *bus, int addr, int regnum)
 {
-	return mxl862xx_phy_read_mmd(bus->priv, port, 0, regnum);
+	return mxl862xx_phy_read_mmd(bus->priv, addr, 0, regnum);
 }
 
-static int mxl862xx_phy_write_mii_bus(struct mii_bus *bus, int port,
+static int mxl862xx_phy_write_mii_bus(struct mii_bus *bus, int addr,
 				      int regnum, u16 val)
 {
-	return mxl862xx_phy_write_mmd(bus->priv, port, 0, regnum, val);
+	return mxl862xx_phy_write_mmd(bus->priv, addr, 0, regnum, val);
 }
 
-static int mxl862xx_phy_read_c45_mii_bus(struct mii_bus *bus, int port,
+static int mxl862xx_phy_read_c45_mii_bus(struct mii_bus *bus, int addr,
 					 int devadd, int regnum)
 {
-	return mxl862xx_phy_read_mmd(bus->priv, port, devadd, regnum);
+	return mxl862xx_phy_read_mmd(bus->priv, addr, devadd, regnum);
 }
 
-static int mxl862xx_phy_write_c45_mii_bus(struct mii_bus *bus, int port,
+static int mxl862xx_phy_write_c45_mii_bus(struct mii_bus *bus, int addr,
 					  int devadd, int regnum, u16 val)
 {
-	return mxl862xx_phy_write_mmd(bus->priv, port, devadd, regnum, val);
+	return mxl862xx_phy_write_mmd(bus->priv, addr, devadd, regnum, val);
 }
 
 static int mxl862xx_wait_ready(struct dsa_switch *ds)