1 files changed, 5 insertions, 14 deletions

diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index e701433bf52f..e853066c805a 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -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 @@ out:
 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)