zram: fix indents/warnings from checkpath

4 files changed, 25 insertions, 15 deletions

diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
index ba800660c..4781eab83 100644
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
@@ -54,6 +54,7 @@ static struct zcomp_backend *backends[] = {
 static struct zcomp_backend *find_backend(const char *compress)
 {
 	int i = 0;
+
 	while (backends[i]) {
 		if (sysfs_streq(compress, backends[i]->name))
 			break;
@@ -77,6 +78,7 @@ static void zcomp_strm_free(struct zcomp *comp, struct zcomp_strm *zstrm)
 static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp, gfp_t flags)
 {
 	struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), flags);
+
 	if (!zstrm)
 		return NULL;
 
@@ -121,16 +123,16 @@ static struct zcomp_strm *zcomp_strm_multi_find(struct zcomp *comp)
 		zs->avail_strm++;
 		spin_unlock(&zs->strm_lock);
 
-        /*
-         * This function can be called in swapout/fs write path
-         * so we can't use GFP_FS|IO. And it assumes we already
-         * have at least one stream in zram initialization so we
-         * don't do best effort to allocate more stream in here.
-         * A default stream will work well without further multiple
-         * streams. That's why we use NORETRY | NOWARN.
-         */
-        zstrm = zcomp_strm_alloc(comp, GFP_NOIO | __GFP_NORETRY |
-                   __GFP_NOWARN);
+	/*
+	 * This function can be called in swapout/fs write path
+	 * so we can't use GFP_FS|IO. And it assumes we already
+	 * have at least one stream in zram initialization so we
+	 * don't do best effort to allocate more stream in here.
+	 * A default stream will work well without further multiple
+	 * streams. That's why we use NORETRY | NOWARN.
+	 */
+	zstrm = zcomp_strm_alloc(comp, GFP_NOIO | __GFP_NORETRY |
+			__GFP_NOWARN);
 		if (!zstrm) {
 			spin_lock(&zs->strm_lock);
 			zs->avail_strm--;
@@ -230,6 +232,7 @@ static int zcomp_strm_multi_create(struct zcomp *comp, int max_strm)
 static struct zcomp_strm *zcomp_strm_single_find(struct zcomp *comp)
 {
 	struct zcomp_strm_single *zs = comp->stream;
+
 	mutex_lock(&zs->strm_lock);
 	return zs->zstrm;
 }
@@ -238,6 +241,7 @@ static void zcomp_strm_single_release(struct zcomp *comp,
 		struct zcomp_strm *zstrm)
 {
 	struct zcomp_strm_single *zs = comp->stream;
+
 	mutex_unlock(&zs->strm_lock);
 }
 
@@ -250,7 +254,9 @@ static bool zcomp_strm_single_set_max_streams(struct zcomp *comp, int num_strm)
 static void zcomp_strm_single_destroy(struct zcomp *comp)
 {
 	struct zcomp_strm_single *zs = comp->stream;
+
 	zcomp_strm_free(comp, zs->zstrm);
+
 	kfree(zs);
 }
 
diff --git a/drivers/block/zram/zcomp_lz4.c b/drivers/block/zram/zcomp_lz4.c
index 4e8be2371..387c76071 100644
--- a/drivers/block/zram/zcomp_lz4.c
+++ b/drivers/block/zram/zcomp_lz4.c
@@ -19,10 +19,10 @@ static void *zcomp_lz4_create(gfp_t flags)
 {
 	void *ret;
 
-    ret = kmalloc(LZ4_MEM_COMPRESS, flags);
+	ret = kmalloc(LZ4_MEM_COMPRESS, flags);
 	if (!ret)
 		ret = __vmalloc(LZ4_MEM_COMPRESS,
-                flags | __GFP_HIGHMEM,
+		flags | __GFP_HIGHMEM,
 				PAGE_KERNEL);
 	return ret;
 }
@@ -36,7 +36,7 @@ static int zcomp_lz4_compress(const unsigned char *src, unsigned char *dst,
 		size_t *dst_len, void *private)
 {
 	/* return  : Failed if return 0 */
-	if(!LZ4_compress_default(src, dst, PAGE_SIZE, *dst_len, private))
+	if (!LZ4_compress_default(src, dst, PAGE_SIZE, *dst_len, private))
 		return -EIO;
 	return 0;
 }
diff --git a/drivers/block/zram/zcomp_lzo.c b/drivers/block/zram/zcomp_lzo.c
index 05b2b96a1..2029ee4ab 100644
--- a/drivers/block/zram/zcomp_lzo.c
+++ b/drivers/block/zram/zcomp_lzo.c
@@ -19,10 +19,10 @@ static void *lzo_create(gfp_t flags)
 {
 	void *ret;
 
-    ret = kmalloc(LZO1X_MEM_COMPRESS, flags);
+	ret = kmalloc(LZO1X_MEM_COMPRESS, flags);
 	if (!ret)
 		ret = __vmalloc(LZO1X_MEM_COMPRESS,
-                flags | __GFP_HIGHMEM,
+		flags | __GFP_HIGHMEM,
 				PAGE_KERNEL);
 	return ret;
 }
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index a2fce1ff2..39da6d7f1 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -168,6 +168,7 @@ static ssize_t comp_algorithm_store(struct device *dev,
 		struct device_attribute *attr, const char *buf, size_t len)
 {
 	struct zram *zram = dev_to_zram(dev);
+
 	down_write(&zram->init_lock);
 	if (init_done(zram)) {
 		up_write(&zram->init_lock);
@@ -238,6 +239,7 @@ static struct zram_meta *zram_meta_alloc(u64 disksize)
 {
 	size_t num_pages;
 	struct zram_meta *meta = kmalloc(sizeof(*meta), GFP_KERNEL);
+
 	if (!meta)
 		goto out;
 
@@ -373,6 +375,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
 	struct page *page;
 	unsigned char *user_mem, *uncmem = NULL;
 	struct zram_meta *meta = zram->meta;
+
 	page = bvec->bv_page;
 
 	read_lock(&meta->tb_lock);
@@ -606,6 +609,7 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
 	/* 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;