File tree Expand file tree Collapse file tree 2 files changed +10
-9
lines changed Expand file tree Collapse file tree 2 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -1065,8 +1065,8 @@ static u64 marvell_get_stat(struct phy_device *phydev, int i)
1065
1065
{
1066
1066
struct marvell_hw_stat stat = marvell_hw_stats [i ];
1067
1067
struct marvell_priv * priv = phydev -> priv ;
1068
- int err , oldpage ;
1069
- u64 val ;
1068
+ int err , oldpage , val ;
1069
+ u64 ret ;
1070
1070
1071
1071
oldpage = phy_read (phydev , MII_MARVELL_PHY_PAGE );
1072
1072
err = phy_write (phydev , MII_MARVELL_PHY_PAGE ,
@@ -1076,16 +1076,16 @@ static u64 marvell_get_stat(struct phy_device *phydev, int i)
1076
1076
1077
1077
val = phy_read (phydev , stat .reg );
1078
1078
if (val < 0 ) {
1079
- val = UINT64_MAX ;
1079
+ ret = UINT64_MAX ;
1080
1080
} else {
1081
1081
val = val & ((1 << stat .bits ) - 1 );
1082
1082
priv -> stats [i ] += val ;
1083
- val = priv -> stats [i ];
1083
+ ret = priv -> stats [i ];
1084
1084
}
1085
1085
1086
1086
phy_write (phydev , MII_MARVELL_PHY_PAGE , oldpage );
1087
1087
1088
- return val ;
1088
+ return ret ;
1089
1089
}
1090
1090
1091
1091
static void marvell_get_stats (struct phy_device * phydev ,
Original file line number Diff line number Diff line change @@ -612,18 +612,19 @@ static u64 kszphy_get_stat(struct phy_device *phydev, int i)
612
612
{
613
613
struct kszphy_hw_stat stat = kszphy_hw_stats [i ];
614
614
struct kszphy_priv * priv = phydev -> priv ;
615
- u64 val ;
615
+ int val ;
616
+ u64 ret ;
616
617
617
618
val = phy_read (phydev , stat .reg );
618
619
if (val < 0 ) {
619
- val = UINT64_MAX ;
620
+ ret = UINT64_MAX ;
620
621
} else {
621
622
val = val & ((1 << stat .bits ) - 1 );
622
623
priv -> stats [i ] += val ;
623
- val = priv -> stats [i ];
624
+ ret = priv -> stats [i ];
624
625
}
625
626
626
- return val ;
627
+ return ret ;
627
628
}
628
629
629
630
static void kszphy_get_stats (struct phy_device * phydev ,
You can’t perform that action at this time.
0 commit comments