Commit 40ba6a12 authored Sep 13, 2019 by Dmitry Torokhov Committed by David S. Miller Sep 16, 2019

net: mdio: switch to using gpiod_get_optional()

The MDIO device reset line is optional and now that gpiod_get_optional()
returns proper value when GPIO support is compiled out, there is no
reason to use fwnode_get_named_gpiod() that I plan to hide away.

Let's switch to using more standard gpiod_get_optional() and
gpiod_set_consumer_name() to keep the nice "PHY reset" label.

Also there is no reason to only try to fetch the reset GPIO when we have
OF node, gpiolib can fetch GPIO data from firmwares as well.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 28f2c362

drivers/net/phy/mdio_bus.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -42,21 +42,17 @@

		static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
		{
		struct gpio_desc *gpiod = NULL;
		int error;

		/* 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 (IS_ERR(gpiod)) {
		if (PTR_ERR(gpiod) == -ENOENT \|\| PTR_ERR(gpiod) == -ENOSYS)
		gpiod = NULL;
		else
		return PTR_ERR(gpiod);
		}
		mdiodev->reset_gpio = gpiod_get_optional(&mdiodev->dev,
		"reset", GPIOD_OUT_LOW);
		error = PTR_ERR_OR_ZERO(mdiodev->reset_gpio);
		if (error)
		return error;

		mdiodev->reset_gpio = gpiod;
		if (mdiodev->reset_gpio)
		gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset");

		return 0;
		}

Admin message