From: Vivien Didelot Date: Mon, 20 Jun 2016 17:14:00 +0000 (-0400) Subject: net: dsa: mv88e6xxx: use already declared variables X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=aa8ac3967e1f8d21b5f89d2a17b1281e1eb52522;p=openwrt%2Fstaging%2Fblogic.git net: dsa: mv88e6xxx: use already declared variables In the MDIO probing function, dev is already assigned to &mdiodev->dev and np is already assigned to mdiodev->dev.of_node, so use them. Signed-off-by: Vivien Didelot Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 673283a89785..b3170ea49592 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -3728,7 +3728,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) if (!ps->info) return -ENODEV; - ps->reset = devm_gpiod_get(&mdiodev->dev, "reset", GPIOD_ASIS); + ps->reset = devm_gpiod_get(dev, "reset", GPIOD_ASIS); if (IS_ERR(ps->reset)) { err = PTR_ERR(ps->reset); if (err == -ENOENT) { @@ -3743,13 +3743,13 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) !of_property_read_u32(np, "eeprom-length", &eeprom_len)) ps->eeprom_len = eeprom_len; - err = mv88e6xxx_mdio_register(ps, mdiodev->dev.of_node); + err = mv88e6xxx_mdio_register(ps, np); if (err) return err; dev_set_drvdata(dev, ds); - err = dsa_register_switch(ds, mdiodev->dev.of_node); + err = dsa_register_switch(ds, np); if (err) { mv88e6xxx_mdio_unregister(ps); return err;