summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2017-07-23 21:45:47 +0300
committerDavid S. Miller <davem@davemloft.net>2017-07-24 16:27:34 -0700
commite470e4f787b94ba0a08cd3b49948e823416f5a6d (patch)
treeb6a7109d4afda29ff41892271fae9d10b98d852e
parenta28b1b90de8322ecc45d58f1c08da12197dad17f (diff)
downloadop-kernel-dev-e470e4f787b94ba0a08cd3b49948e823416f5a6d.zip
op-kernel-dev-e470e4f787b94ba0a08cd3b49948e823416f5a6d.tar.gz
of_mdio: kill useless variable in of_phy_register_fixed_link()
of_phy_register_fixed_link() declares the 'err' variable to hold the result of of_property_read_string() but only uses it once after that, while that function can be called directly from the *if* statement... Remove that variable and move/regroup 'link_gpio' and 'len' variables in order to sort the declarations in the reverse Xmas tree order -- to please DaveM. ;-) Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/of/of_mdio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index e0dbd6e..a0d27c0 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -422,13 +422,11 @@ int of_phy_register_fixed_link(struct device_node *np)
struct fixed_phy_status status = {};
struct device_node *fixed_link_node;
const __be32 *fixed_link_prop;
- int link_gpio;
- int len, err;
struct phy_device *phy;
const char *managed;
+ int link_gpio, len;
- err = of_property_read_string(np, "managed", &managed);
- if (err == 0) {
+ if (of_property_read_string(np, "managed", &managed) == 0) {
if (strcmp(managed, "in-band-status") == 0) {
/* status is zeroed, namely its .link member */
phy = fixed_phy_register(PHY_POLL, &status, -1, np);
OpenPOWER on IntegriCloud