From: Bryan Wu <bryan.wu@canonical.com>
To: linux-leds@vger.kernel.org, rpurdie@rpsys.net,
linux-kernel@vger.kernel.org
Subject: [PATCH 25/25] leds: convert One-shot LED trigger driver to devm_kzalloc() and cleanup error exit path
Date: Wed, 4 Jul 2012 13:10:17 +0800 [thread overview]
Message-ID: <1341378617-10386-26-git-send-email-bryan.wu@canonical.com> (raw)
In-Reply-To: <1341378617-10386-1-git-send-email-bryan.wu@canonical.com>
Cc: Fabio Baltieri <fabio.baltieri@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
drivers/leds/ledtrig-oneshot.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/leds/ledtrig-oneshot.c b/drivers/leds/ledtrig-oneshot.c
index 2c029aa..6395a38 100644
--- a/drivers/leds/ledtrig-oneshot.c
+++ b/drivers/leds/ledtrig-oneshot.c
@@ -127,7 +127,8 @@ static void oneshot_trig_activate(struct led_classdev *led_cdev)
struct oneshot_trig_data *oneshot_data;
int rc;
- oneshot_data = kzalloc(sizeof(*oneshot_data), GFP_KERNEL);
+ oneshot_data = devm_kzalloc(led_cdev->dev, sizeof(*oneshot_data),
+ GFP_KERNEL);
if (!oneshot_data)
return;
@@ -135,7 +136,7 @@ static void oneshot_trig_activate(struct led_classdev *led_cdev)
rc = device_create_file(led_cdev->dev, &dev_attr_delay_on);
if (rc)
- goto err_out_trig_data;
+ return;
rc = device_create_file(led_cdev->dev, &dev_attr_delay_off);
if (rc)
goto err_out_delayon;
@@ -159,8 +160,6 @@ err_out_delayoff:
device_remove_file(led_cdev->dev, &dev_attr_delay_off);
err_out_delayon:
device_remove_file(led_cdev->dev, &dev_attr_delay_on);
-err_out_trig_data:
- kfree(led_cdev->trigger_data);
}
static void oneshot_trig_deactivate(struct led_classdev *led_cdev)
@@ -172,7 +171,6 @@ static void oneshot_trig_deactivate(struct led_classdev *led_cdev)
device_remove_file(led_cdev->dev, &dev_attr_delay_off);
device_remove_file(led_cdev->dev, &dev_attr_invert);
device_remove_file(led_cdev->dev, &dev_attr_shot);
- kfree(oneshot_data);
led_cdev->activated = false;
}
--
1.7.10.4
next prev parent reply other threads:[~2012-07-04 5:14 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 ` [PATCH 14/25] leds: convert PCA955x " Bryan Wu
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 ` Bryan Wu [this message]
2012-07-05 16:47 ` [PATCH 25/25] leds: convert One-shot LED trigger driver to devm_kzalloc() and cleanup error exit path 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-26-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®