mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Bryan Wu <bryan.wu@canonical.com>
To: linux-leds@vger.kernel.org, rpurdie@rpsys.net,
	linux-kernel@vger.kernel.org
Subject: [PATCH 14/25] leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path
Date: Wed,  4 Jul 2012 13:10:06 +0800	[thread overview]
Message-ID: <1341378617-10386-15-git-send-email-bryan.wu@canonical.com> (raw)
In-Reply-To: <1341378617-10386-1-git-send-email-bryan.wu@canonical.com>

Cc: Nate Case <ncase@xes-inc.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
 drivers/leds/leds-pca955x.c |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 5f462db..aef3cf0 100644
--- 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;
 }
 
-- 
1.7.10.4


  parent reply	other threads:[~2012-07-04  5:12 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-04  5:09 [PATCH 00/25] leds: convert all kzalloc() to devm_kzalloc() Bryan Wu
2012-07-04  5:09 ` [PATCH 01/25] leds: convert Big Networks LED driver " Bryan Wu
2012-07-04  5:09 ` [PATCH 02/25] leds: convert HTC ASIC3 LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-04  5:09 ` [PATCH 03/25] leds: convert Atmel PWM LED driver to devm_kzalloc() Bryan Wu
2012-07-04  5:09 ` [PATCH 04/25] leds: convert LP3944 " Bryan Wu
2012-07-04  7:34   ` Bryan Wu
2012-07-04  5:09 ` [PATCH 05/25] leds: convert DA9030/DA9034 LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-04  5:09 ` [PATCH 06/25] leds: convert LP5521 " Bryan Wu
2012-07-04  7:35   ` Bryan Wu
2012-07-04  5:09 ` [PATCH 07/25] leds: convert BD2802 RGB " Bryan Wu
2012-07-04  5:10 ` [PATCH 08/25] leds: convert PCA9633 LED driver to devm_kzalloc() Bryan Wu
2012-07-04  5:10 ` [PATCH 09/25] leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-04  5:10 ` [PATCH 10/25] leds: convert Renesas TPU " Bryan Wu
2012-07-04  5:10 ` [PATCH 11/25] leds: convert LT3593 LED driver to devm_kzalloc() Bryan Wu
2012-07-04  5:10 ` [PATCH 12/25] leds: convert PCA9532 " Bryan Wu
2012-07-04  5:10 ` [PATCH 13/25] leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-04  5:10 ` Bryan Wu [this message]
2012-07-04  5:10 ` [PATCH 15/25] leds: convert ADP5520 " Bryan Wu
2012-07-04  7:40   ` Bryan Wu
2012-07-04  5:10 ` [PATCH 16/25] leds: convert Freescale MC13783 " Bryan Wu
2012-07-04  5:10 ` [PATCH 17/25] leds: convert TCA6507 LED driver to devm_kzalloc() Bryan Wu
2012-07-04  5:10 ` [PATCH 18/25] leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-05  0:01   ` Linus Walleij
2012-07-04  5:10 ` [PATCH 19/25] leds: convert DAC124S085 LED driver to devm_kzalloc() Bryan Wu
2012-07-04  5:10 ` [PATCH 20/25] leds: convert Network Space v2 LED driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-04  5:10 ` [PATCH 21/25] leds: convert transient LED trigger driver to devm_kzalloc() Bryan Wu
2012-07-05 16:42   ` Shuah Khan
2012-07-04  5:10 ` [PATCH 22/25] leds: convert GPIO LED trigger driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-05 16:45   ` Shuah Khan
2012-07-04  5:10 ` [PATCH 23/25] leds: convert Backlight emulation " Bryan Wu
2012-07-05 16:46   ` Shuah Khan
2012-07-04  5:10 ` [PATCH 24/25] leds: convert Heartbeat LED trigger driver to devm_kzalloc() Bryan Wu
2012-07-05 16:46   ` Shuah Khan
2012-07-04  5:10 ` [PATCH 25/25] leds: convert One-shot LED trigger driver to devm_kzalloc() and cleanup error exit path Bryan Wu
2012-07-05 16:47   ` Shuah Khan
2012-07-05 19:48     ` Fabio Baltieri
2012-07-05 20:35       ` Shuah Khan
2012-07-06  4:02         ` Bryan Wu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1341378617-10386-15-git-send-email-bryan.wu@canonical.com \
    --to=bryan.wu@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=rpurdie@rpsys.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®