Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d9665c authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

net: mdio-gpio: Use devm_gpio_request_one instead of devm_gpio_request 



Using devm_gpio_request_one lets us request gpio pins with initial state
in one go.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37c9782c

drivers/net/phy/mdio-gpio.c

+6 −7
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 
	struct mii_bus *new_bus;

	struct mdio_gpio_info *bitbang;

	int i;

	unsigned long mdc_flags = GPIOF_OUT_INIT_LOW;

	unsigned long mdio_flags = GPIOF_DIR_IN;

	unsigned long mdo_flags = GPIOF_OUT_INIT_HIGH;



	bitbang = devm_kzalloc(dev, sizeof(*bitbang), GFP_KERNEL);

	if (!bitbang)
@@ -174,21 +177,17 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 
	else

		strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE);



	if (devm_gpio_request(dev, bitbang->mdc, "mdc"))

	if (devm_gpio_request_one(dev, bitbang->mdc, mdc_flags, "mdc"))

		goto out_free_bus;



	if (devm_gpio_request(dev, bitbang->mdio, "mdio"))

	if (devm_gpio_request_one(dev, bitbang->mdio, mdio_flags, "mdio"))

		goto out_free_bus;



	if (bitbang->mdo) {

		if (devm_gpio_request(dev, bitbang->mdo, "mdo"))

		if (devm_gpio_request_one(dev, bitbang->mdo, mdo_flags, "mdo"))

			goto out_free_bus;

		gpio_direction_output(bitbang->mdo, 1);

		gpio_direction_input(bitbang->mdio);

	}



	gpio_direction_output(bitbang->mdc, 0);



	dev_set_drvdata(dev, new_bus);



	return new_bus;