openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: mdio-gpio: Use devm_ functions where possible 

This simplifies error path and deinit/removal functions.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Chris Healy <cphealy@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck 2014-04-15 19:16:40 -07:00 committed by David S. Miller
parent bc383ea522
commit 78cdb07968
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/phy/mdio-gpio.c
View File

@ -110,7 +110,7 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
struct mdio_gpio_info *bitbang; struct mdio_gpio_info *bitbang;
int i; int i;
bitbang = kzalloc(sizeof(*bitbang), GFP_KERNEL); bitbang = devm_kzalloc(dev, sizeof(*bitbang), GFP_KERNEL);
if (!bitbang) if (!bitbang)
goto out; goto out;
@ -121,7 +121,7 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
new_bus = alloc_mdio_bitbang(&bitbang->ctrl); new_bus = alloc_mdio_bitbang(&bitbang->ctrl);
if (!new_bus) if (!new_bus)
goto out_free_bitbang; goto out;
new_bus->name = "GPIO Bitbanged MDIO", 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); 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; goto out_free_bus;
if (gpio_request(bitbang->mdio, "mdio")) if (devm_gpio_request(dev, bitbang->mdio, "mdio"))
goto out_free_mdc; goto out_free_bus;
gpio_direction_output(bitbang->mdc, 0); gpio_direction_output(bitbang->mdc, 0);
@ -150,12 +150,8 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
return new_bus; return new_bus;
out_free_mdc:
gpio_free(bitbang->mdc);
out_free_bus: out_free_bus:
free_mdio_bitbang(new_bus); free_mdio_bitbang(new_bus);
out_free_bitbang:
kfree(bitbang);
out: out:
return NULL; 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) static void mdio_gpio_bus_deinit(struct device *dev)
{ {
struct mii_bus *bus = dev_get_drvdata(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); free_mdio_bitbang(bus);
kfree(bitbang);
} }
static void mdio_gpio_bus_destroy(struct device *dev) static void mdio_gpio_bus_destroy(struct device *dev)