Messages in this thread Patch in this message | | | From | Jiang Liu <> | Subject | [PATCH v2 09/10] zram: minor code cleanup | Date | Wed, 5 Jun 2013 00:06:07 +0800 |
| |
Minor code cleanup for zram.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com> --- drivers/staging/zram/zram_drv.c | 11 ++++------- drivers/staging/zram/zram_sysfs.c | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index a4595ca..088bd6a 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -481,13 +481,11 @@ static void __zram_reset_device(struct zram *zram) /* Free all pages that are still in this zram device */ for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) { unsigned long handle = meta->table[index].handle; - if (!handle) - continue; - - zs_free(meta->mem_pool, handle); + if (handle) + zs_free(meta->mem_pool, handle); } - zram_meta_free(zram->meta); + zram_meta_free(meta); zram->meta = NULL; /* Reset stats */ memset(&zram->stats, 0, sizeof(zram->stats)); @@ -686,8 +684,7 @@ static int __init zram_init(void) int ret, dev_id; if (num_devices > max_num_devices) { - pr_warn("Invalid value for num_devices: %u\n", - num_devices); + pr_warn("Invalid value for num_devices: %u\n", num_devices); ret = -EINVAL; goto out; } diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c index e239d94..2ae6b50 100644 --- a/drivers/staging/zram/zram_sysfs.c +++ b/drivers/staging/zram/zram_sysfs.c @@ -187,8 +187,7 @@ static ssize_t mem_used_total_show(struct device *dev, return sprintf(buf, "%llu\n", val); } -static DEVICE_ATTR(disksize, S_IRUGO | S_IWUSR, - disksize_show, disksize_store); +static DEVICE_ATTR(disksize, S_IRUGO | S_IWUSR, disksize_show, disksize_store); static DEVICE_ATTR(initstate, S_IRUGO, initstate_show, NULL); static DEVICE_ATTR(reset, S_IWUSR, NULL, reset_store); static DEVICE_ATTR(num_reads, S_IRUGO, num_reads_show, NULL); -- 1.8.1.2
| |