diff options
| author |   Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-01-01 21:24:13 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-15 23:45:27 -0800 |
| commit | ca3d70bd68455133eabcb8a0ae1b40254d87188b (patch) | |
| tree | 5c88a11645905844ad1972ce33ff60208d4313a3 /drivers/staging/zram/zram_drv.c | |
| parent | staging: ced1401: fix GFP_KERNEL in spinlock context (diff) | |
| download | linux-dev-ca3d70bd68455133eabcb8a0ae1b40254d87188b.tar.xz linux-dev-ca3d70bd68455133eabcb8a0ae1b40254d87188b.zip | |
staging: zram: simplify num_devices paramater
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>
Diffstat (limited to 'drivers/staging/zram/zram_drv.c')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index fb4a7c94aed3..8115be90517c 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -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; free_devices: |