Skip to content

Commit

Permalink
staging: zram: simplify num_devices paramater
Browse files Browse the repository at this point in the history
Simplify dealing with num_devices when initializing zram.
Also cleanup some of the output messages.

Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Davidlohr Bueso authored and Greg Kroah-Hartman committed Jan 16, 2013
1 parent 955e7da commit ca3d70b
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/staging/zram/zram_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand All @@ -734,6 +728,8 @@ static int __init zram_init(void)
goto free_devices;
}

pr_info("Created %u device(s) ...\n", num_devices);

return 0;

free_devices:
Expand Down

0 comments on commit ca3d70b

Please sign in to comment.