--- a/drivers/net/phy/mdio_bus.c 2018-02-03 17:34:46.973045321 +0100 +++ b/drivers/net/phy/mdio_bus.c 2018-02-04 11:03:14.909093360 +0100 @@ -47,41 +47,11 @@ #include "mdio-boardinfo.h" -static int mdiobus_register_gpiod(struct mdio_device *mdiodev) -{ - struct gpio_desc *gpiod = NULL; - - /* Deassert the optional reset signal */ - if (mdiodev->dev.of_node) - gpiod = fwnode_get_named_gpiod(&mdiodev->dev.of_node->fwnode, - "reset-gpios", 0, GPIOD_OUT_LOW, - "PHY reset"); - if (PTR_ERR(gpiod) == -ENOENT) - gpiod = NULL; - else if (IS_ERR(gpiod)) - return PTR_ERR(gpiod); - - mdiodev->reset = gpiod; - - /* Assert the reset signal again */ - mdio_device_reset(mdiodev, 1); - - return 0; -} - int mdiobus_register_device(struct mdio_device *mdiodev) { - int err; - if (mdiodev->bus->mdio_map[mdiodev->addr]) return -EBUSY; - if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) { - err = mdiobus_register_gpiod(mdiodev); - if (err) - return err; - } - mdiodev->bus->mdio_map[mdiodev->addr] = mdiodev; return 0;