Commit e0e9ada1 authored by Christian Marangi's avatar Christian Marangi Committed by David S. Miller

net: phy: at803x: refactor qca808x cable test get status function

Refactor qca808x cable test get status function to remove code
duplication and clean things up.

The same logic is applied to each pair hence it can be generalized and
moved to a common function.
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22eb2760
...@@ -2035,10 +2035,43 @@ static int qca808x_cable_test_start(struct phy_device *phydev) ...@@ -2035,10 +2035,43 @@ static int qca808x_cable_test_start(struct phy_device *phydev)
return 0; return 0;
} }
static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
u16 status)
{
u16 pair_code;
int length;
switch (pair) {
case ETHTOOL_A_CABLE_PAIR_A:
pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
break;
case ETHTOOL_A_CABLE_PAIR_B:
pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
break;
case ETHTOOL_A_CABLE_PAIR_C:
pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
break;
case ETHTOOL_A_CABLE_PAIR_D:
pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
break;
default:
return -EINVAL;
}
ethnl_cable_test_result(phydev, pair,
qca808x_cable_test_result_trans(pair_code));
if (qca808x_cdt_fault_length_valid(pair_code)) {
length = qca808x_cdt_fault_length(phydev, pair);
ethnl_cable_test_fault_length(phydev, pair, length);
}
return 0;
}
static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished) static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
{ {
int ret, val; int ret, val;
int pair_a, pair_b, pair_c, pair_d;
*finished = false; *finished = false;
...@@ -2057,36 +2090,21 @@ static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finish ...@@ -2057,36 +2090,21 @@ static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finish
if (val < 0) if (val < 0)
return val; return val;
pair_a = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, val); ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
pair_b = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, val); if (ret)
pair_c = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, val); return ret;
pair_d = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, val);
ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_A, if (ret)
qca808x_cable_test_result_trans(pair_a)); return ret;
ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_B,
qca808x_cable_test_result_trans(pair_b)); ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_C, if (ret)
qca808x_cable_test_result_trans(pair_c)); return ret;
ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_D,
qca808x_cable_test_result_trans(pair_d)); ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
if (ret)
if (qca808x_cdt_fault_length_valid(pair_a)) { return ret;
val = qca808x_cdt_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_A);
ethnl_cable_test_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
}
if (qca808x_cdt_fault_length_valid(pair_b)) {
val = qca808x_cdt_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_B);
ethnl_cable_test_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
}
if (qca808x_cdt_fault_length_valid(pair_c)) {
val = qca808x_cdt_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_C);
ethnl_cable_test_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
}
if (qca808x_cdt_fault_length_valid(pair_d)) {
val = qca808x_cdt_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_D);
ethnl_cable_test_fault_length(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
}
*finished = true; *finished = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment