leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path

Cc: Nate Case <ncase@xes-inc.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 5f462dbf0dbbf4920bfc281c6ad69cfc8486ed5d..aef3cf0432fe7ba1374e9b4111fdd0c7ae1f9af1 100644 (file)
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -293,15 +293,14 @@ static int __devinit pca955x_probe(struct i2c_client *client,
                }
        }
 
-       pca955x = kzalloc(sizeof(*pca955x), GFP_KERNEL);
+       pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
        if (!pca955x)
                return -ENOMEM;
 
-       pca955x->leds = kzalloc(sizeof(*pca955x_led) * chip->bits, GFP_KERNEL);
-       if (!pca955x->leds) {
-               err = -ENOMEM;
-               goto exit_nomem;
-       }
+       pca955x->leds = devm_kzalloc(&client->dev,
+                       sizeof(*pca955x_led) * chip->bits, GFP_KERNEL);
+       if (!pca955x->leds)
+               return -ENOMEM;
 
        i2c_set_clientdata(client, pca955x);
 
@@ -361,10 +360,6 @@ exit:
                cancel_work_sync(&pca955x->leds[i].work);
        }
 
-       kfree(pca955x->leds);
-exit_nomem:
-       kfree(pca955x);
-
        return err;
 }
 
@@ -378,9 +373,6 @@ static int __devexit pca955x_remove(struct i2c_client *client)
                cancel_work_sync(&pca955x->leds[i].work);
        }
 
-       kfree(pca955x->leds);
-       kfree(pca955x);
-
        return 0;
 }