Commit ca3d70bd authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Greg Kroah-Hartman

staging: zram: simplify num_devices paramater

Simplify dealing with num_devices when initializing zram.
Also cleanup some of the output messages.
Signed-off-by: default avatarDavidlohr Bueso <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 955e7da8
......@@ -40,7 +40,7 @@ static int zram_major;
struct zram *zram_devices;
/* Module params (documentation at end) */
static unsigned int num_devices;
static unsigned int num_devices = 1;
static void zram_stat_inc(u32 *v)
......@@ -715,13 +715,7 @@ static int __init zram_init(void)
goto out;
if (!num_devices) {
pr_info("num_devices not specified. Using default: 1\n");
num_devices = 1;
/* Allocate the device array and initialize each one */
pr_info("Creating %u devices ...\n", num_devices);
zram_devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL);
if (!zram_devices) {
ret = -ENOMEM;
......@@ -734,6 +728,8 @@ static int __init zram_init(void)
goto free_devices;
pr_info("Created %u device(s) ...\n", num_devices);
return 0;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment