net: dsa: switch to devm_ calls and remove kfree calls
authorNeil Armstrong <narmstrong@baylibre.com>
Tue, 6 Oct 2015 14:40:37 +0000 (15:40 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2015 11:56:09 +0000 (04:56 -0700)
Now the kfree calls exists in the the remove functions, remove them in all
places except the of_probe functions and replace allocation calls
with their devm_ counterparts.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/dsa.c

index 61559232861be76f61284de44701a8a317cc70f3..d5a162cda0878fe3b7041e9f017c8b39b615728f 100644 (file)
@@ -306,7 +306,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
        if (ret < 0)
                goto out;
 
-       ds->slave_mii_bus = mdiobus_alloc();
+       ds->slave_mii_bus = devm_mdiobus_alloc(parent);
        if (ds->slave_mii_bus == NULL) {
                ret = -ENOMEM;
                goto out;
@@ -315,7 +315,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 
        ret = mdiobus_register(ds->slave_mii_bus);
        if (ret < 0)
-               goto out_free;
+               goto out;
 
 
        /*
@@ -368,10 +368,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 
        return ret;
 
-out_free:
-       mdiobus_free(ds->slave_mii_bus);
 out:
-       kfree(ds);
        return ret;
 }
 
@@ -401,7 +398,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
        /*
         * Allocate and initialise switch state.
         */
-       ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL);
+       ds = devm_kzalloc(parent, sizeof(*ds) + drv->priv_size, GFP_KERNEL);
        if (ds == NULL)
                return ERR_PTR(-ENOMEM);
 
@@ -462,7 +459,6 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
        }
 
        mdiobus_unregister(ds->slave_mii_bus);
-       mdiobus_free(ds->slave_mii_bus);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -922,7 +918,7 @@ static int dsa_probe(struct platform_device *pdev)
                goto out;
        }
 
-       dst = kzalloc(sizeof(*dst), GFP_KERNEL);
+       dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
        if (dst == NULL) {
                dev_put(dev);
                ret = -ENOMEM;
@@ -953,10 +949,8 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
        for (i = 0; i < dst->pd->nr_chips; i++) {
                struct dsa_switch *ds = dst->ds[i];
 
-               if (ds) {
+               if (ds)
                        dsa_switch_destroy(ds);
-                       kfree(ds);
-               }
        }
 }
 
@@ -965,7 +959,6 @@ static int dsa_remove(struct platform_device *pdev)
        struct dsa_switch_tree *dst = platform_get_drvdata(pdev);
 
        dsa_remove_dst(dst);
-       kfree(dst);
        dsa_of_remove(&pdev->dev);
 
        return 0;