From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kees Cook <keescook@chromium.org>,
Colin Cross <ccross@android.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
John Stultz <john.stultz@linaro.org>,
arve@android.com, Rebecca Schultz Zavin <rebecca@android.com>,
Jesper Juhl <jj@chaosbits.net>,
Randy Dunlap <rdunlap@xenotime.net>,
Stephen Boyd <sboyd@codeaurora.org>,
Thomas Meyer <thomas@m3y3r.de>,
Andrew Morton <akpm@linux-foundation.org>,
Marco Stornelli <marco.stornelli@gmail.com>,
WANG Cong <xiyou.wangcong@gmail.com>,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
linaro-kernel@lists.linaro.org, patches@linaro.org,
kernel-team@android.com
Subject: [PATCH 03/11] persistent_ram: Introduce persistent_ram_post_init()
Date: Fri, 11 May 2012 17:17:25 -0700 [thread overview]
Message-ID: <20120512001725.GC14782@lizard> (raw)
In-Reply-To: <20120512001506.GA8653@lizard>
Factor post init logic out of __persistent_ram_init(), we'll need
it for the new persistent_ram_new() routine.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
drivers/staging/android/persistent_ram.c | 44 ++++++++++++++++++------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/android/persistent_ram.c b/drivers/staging/android/persistent_ram.c
index 13a12bc..ec23822 100644
--- a/drivers/staging/android/persistent_ram.c
+++ b/drivers/staging/android/persistent_ram.c
@@ -378,28 +378,15 @@ static int __init persistent_ram_buffer_init(const char *name,
return -EINVAL;
}
-static __init
-struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
+static int __init persistent_ram_post_init(struct persistent_ram_zone *prz, bool ecc)
{
- struct persistent_ram_zone *prz;
- int ret = -ENOMEM;
-
- prz = kzalloc(sizeof(struct persistent_ram_zone), GFP_KERNEL);
- if (!prz) {
- pr_err("persistent_ram: failed to allocate persistent ram zone\n");
- goto err;
- }
-
- ret = persistent_ram_buffer_init(dev_name(dev), prz);
- if (ret) {
- pr_err("persistent_ram: failed to initialize buffer\n");
- goto err;
- }
+ int ret;
prz->ecc = ecc;
+
ret = persistent_ram_init_ecc(prz, prz->buffer_size);
if (ret)
- goto err;
+ return ret;
if (prz->buffer->sig == PERSISTENT_RAM_SIG) {
if (buffer_size(prz) > prz->buffer_size ||
@@ -422,6 +409,29 @@ struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
atomic_set(&prz->buffer->start, 0);
atomic_set(&prz->buffer->size, 0);
+ return 0;
+}
+
+static __init
+struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
+{
+ struct persistent_ram_zone *prz;
+ int ret = -ENOMEM;
+
+ prz = kzalloc(sizeof(struct persistent_ram_zone), GFP_KERNEL);
+ if (!prz) {
+ pr_err("persistent_ram: failed to allocate persistent ram zone\n");
+ goto err;
+ }
+
+ ret = persistent_ram_buffer_init(dev_name(dev), prz);
+ if (ret) {
+ pr_err("persistent_ram: failed to initialize buffer\n");
+ goto err;
+ }
+
+ persistent_ram_post_init(prz, ecc);
+
return prz;
err:
kfree(prz);
--
1.7.9.2
next prev parent reply other threads:[~2012-05-12 0:18 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-12 0:15 [PATCH 0/11] Merge ramoops and persistent_ram, generic pstore RAM backend Anton Vorontsov
2012-05-12 0:17 ` [PATCH 01/11] persistent_ram: Remove prz->node Anton Vorontsov
2012-05-12 0:17 ` [PATCH 02/11] persistent_ram: Fix buffer size clamping during writes Anton Vorontsov
2012-05-13 16:56 ` Dan Carpenter
2012-05-13 20:38 ` Anton Vorontsov
2012-05-14 3:23 ` Colin Cross
2012-05-14 4:17 ` Greg Kroah-Hartman
2012-05-12 0:17 ` Anton Vorontsov [this message]
2012-05-12 0:17 ` [PATCH 04/11] persistent_ram: Introduce persistent_ram_new() Anton Vorontsov
2012-05-15 0:37 ` Colin Cross
2012-05-16 0:22 ` Anton Vorontsov
2012-05-12 0:17 ` [PATCH 05/11] persistent_ram: Introduce persistent_ram_vmap() Anton Vorontsov
2012-05-12 0:17 ` [PATCH 06/11] persistent_ram: Make it possible to use memory outside of bootmem Anton Vorontsov
2012-06-06 21:10 ` Colin Cross
2012-06-06 22:11 ` Anton Vorontsov
2012-05-12 0:18 ` [PATCH 07/11] persistent_ram: Introduce persistent_ram_free() Anton Vorontsov
2012-05-12 0:18 ` [PATCH 08/11] ramoops: Move to fs/pstore/ram.c Anton Vorontsov
2012-05-14 21:34 ` Kees Cook
2012-05-16 0:19 ` Anton Vorontsov
2012-05-15 15:12 ` Shuah Khan
2012-05-16 7:30 ` Anton Vorontsov
2012-05-16 15:17 ` Shuah Khan
2012-05-12 0:18 ` [PATCH 09/11] persistent_ram: Move to fs/pstore/ram_core.c Anton Vorontsov
2012-05-14 21:43 ` Kees Cook
2012-05-12 0:18 ` [PATCH 10/11] pstore/ram: Switch to persistent_ram routines Anton Vorontsov
2012-05-14 22:21 ` Kees Cook
2012-05-16 6:14 ` Anton Vorontsov
2012-05-16 12:44 ` Kees Cook
2012-05-12 0:18 ` [PATCH 11/11] pstore/ram: Add ECC support Anton Vorontsov
2012-05-14 22:22 ` Kees Cook
2012-05-14 15:58 ` [PATCH 0/11] Merge ramoops and persistent_ram, generic pstore RAM backend Greg Kroah-Hartman
2012-05-14 16:30 ` Shuah Khan
2012-05-14 20:45 ` Anton Vorontsov
2012-05-14 20:55 ` Shuah Khan
2012-05-15 15:53 ` Greg Kroah-Hartman
2012-05-15 6:07 ` Marco Stornelli
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=20120512001725.GC14782@lizard \
--to=anton.vorontsov@linaro.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=arve@android.com \
--cc=ccross@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jj@chaosbits.net \
--cc=john.stultz@linaro.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marco.stornelli@gmail.com \
--cc=patches@linaro.org \
--cc=rdunlap@xenotime.net \
--cc=rebecca@android.com \
--cc=sboyd@codeaurora.org \
--cc=thomas@m3y3r.de \
--cc=xiyou.wangcong@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).