Commit 78cdb079 authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

net: mdio-gpio: Use devm_ functions where possible 



This simplifies error path and deinit/removal functions.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarChris Healy <cphealy@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc383ea5

drivers/net/phy/mdio-gpio.c

+5 −14
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 
	struct mdio_gpio_info *bitbang;

	int i;



	bitbang = kzalloc(sizeof(*bitbang), GFP_KERNEL);

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

	if (!bitbang)

		goto out;
@@ -121,7 +121,7 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 


	new_bus = alloc_mdio_bitbang(&bitbang->ctrl);

	if (!new_bus)

		goto out_free_bitbang;

		goto out;



	new_bus->name = "GPIO Bitbanged MDIO",
@@ -138,11 +138,11 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 


	snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);



	if (gpio_request(bitbang->mdc, "mdc"))

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

		goto out_free_bus;



	if (gpio_request(bitbang->mdio, "mdio"))

		goto out_free_mdc;

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

		goto out_free_bus;



	gpio_direction_output(bitbang->mdc, 0);
@@ -150,12 +150,8 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 


	return new_bus;



out_free_mdc:

	gpio_free(bitbang->mdc);

out_free_bus:

	free_mdio_bitbang(new_bus);

out_free_bitbang:

	kfree(bitbang);

out:

	return NULL;

}
@@ -163,13 +159,8 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 
static void mdio_gpio_bus_deinit(struct device *dev)

{

	struct mii_bus *bus = dev_get_drvdata(dev);

	struct mdio_gpio_info *bitbang = bus->priv;



	dev_set_drvdata(dev, NULL);

	gpio_free(bitbang->mdio);

	gpio_free(bitbang->mdc);

	free_mdio_bitbang(bus);

	kfree(bitbang);

}



static void mdio_gpio_bus_destroy(struct device *dev)