From: Davidlohr Bueso Date: Wed, 2 Jan 2013 05:24:13 +0000 (-0800) Subject: staging: zram: simplify num_devices paramater X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca3d70bd68455133eabcb8a0ae1b40254d87188b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index fb4a7c94aed..8115be90517 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: