From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754517AbcEYNea (ORCPT ); Wed, 25 May 2016 09:34:30 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34670 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084AbcEYNc6 (ORCPT ); Wed, 25 May 2016 09:32:58 -0400 From: Sergey Senozhatsky To: Minchan Kim Cc: Andrew Morton , Joonsoo Kim , linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [PATCH 3/7] zram: drop zcomp param from compress/decompress Date: Wed, 25 May 2016 23:30:02 +0900 Message-Id: <20160525143006.1207-4-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.8.3.394.g3916adf In-Reply-To: <20160525143006.1207-1-sergey.senozhatsky@gmail.com> References: <20160525143006.1207-1-sergey.senozhatsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We don't need to supply a zcomp pointer to compress/decompress functions, drop it. Signed-off-by: Sergey Senozhatsky Cc: Minchan Kim Cc: Joonsoo Kim --- drivers/block/zram/zcomp.c | 5 ++--- drivers/block/zram/zcomp.h | 4 ++-- drivers/block/zram/zram_drv.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index 82b568e..6e16fa2 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -102,7 +102,7 @@ void zcomp_stream_put(struct zcomp *comp) put_cpu_ptr(comp->stream); } -int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, +int zcomp_compress(struct zcomp_strm *zstrm, const unsigned char *src, unsigned int *dst_len) { /* @@ -126,8 +126,7 @@ int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, zstrm->buffer, dst_len); } -int zcomp_decompress(struct zcomp *comp, - struct zcomp_strm *zstrm, +int zcomp_decompress(struct zcomp_strm *zstrm, const unsigned char *src, size_t src_len, unsigned char *dst) { diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index ba36bde..3fb9dc4 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -53,10 +53,10 @@ void zcomp_destroy(struct zcomp *comp); struct zcomp_strm *zcomp_stream_get(struct zcomp *comp); void zcomp_stream_put(struct zcomp *comp); -int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, +int zcomp_compress(struct zcomp_strm *zstrm, const unsigned char *src, unsigned int *dst_len); -int zcomp_decompress(struct zcomp *comp, struct zcomp_strm *zstrm, +int zcomp_decompress(struct zcomp_strm *zstrm, const unsigned char *src, size_t src_len, unsigned char *dst); diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index fa22a32..99c8be7 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -581,7 +581,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) } else { struct zcomp_strm *zstrm = zcomp_stream_get(zram->comp); - ret = zcomp_decompress(zram->comp, zstrm, cmem, size, mem); + ret = zcomp_decompress(zstrm, cmem, size, mem); zcomp_stream_put(zram->comp); } zs_unmap_object(meta->mem_pool, handle); @@ -700,7 +700,7 @@ compress_again: } zstrm = zcomp_stream_get(zram->comp); - ret = zcomp_compress(zram->comp, zstrm, uncmem, &clen); + ret = zcomp_compress(zstrm, uncmem, &clen); if (!is_partial_io(bvec)) { kunmap_atomic(user_mem); user_mem = NULL; -- 2.8.3.394.g3916adf