Skip to content

Commit

Permalink
net: phy: mscc: remove unneeded temporary variable
Browse files Browse the repository at this point in the history
Here, the rc variable is either used only for the condition right after
the assignment or right before being used as the return value of the
function it's being used in.

So let's remove this unneeded temporary variable whenever possible.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Quentin Schulz authored and David S. Miller committed Oct 8, 2018
1 parent 6f0430c commit 629ea0f
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/net/phy/mscc.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,20 +481,18 @@ static void vsc85xx_wol_get(struct phy_device *phydev,
static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
{
u32 vdd, sd;
int rc, i, j;
int i, j;
struct device *dev = &phydev->mdio.dev;
struct device_node *of_node = dev->of_node;
u8 sd_array_size = ARRAY_SIZE(edge_table[0].slowdown);

if (!of_node)
return -ENODEV;

rc = of_property_read_u32(of_node, "vsc8531,vddmac", &vdd);
if (rc != 0)
if (of_property_read_u32(of_node, "vsc8531,vddmac", &vdd))
vdd = MSCC_VDDMAC_3300;

rc = of_property_read_u32(of_node, "vsc8531,edge-slowdown", &sd);
if (rc != 0)
if (of_property_read_u32(of_node, "vsc8531,edge-slowdown", &sd))
sd = 0;

for (i = 0; i < ARRAY_SIZE(edge_table); i++)
Expand Down Expand Up @@ -735,9 +733,7 @@ static int vsc85xx_config_init(struct phy_device *phydev)
return rc;
}

rc = genphy_config_init(phydev);

return rc;
return genphy_config_init(phydev);
}

static int vsc85xx_ack_interrupt(struct phy_device *phydev)
Expand Down

0 comments on commit 629ea0f

Please sign in to comment.