[PATCH 4/7] zram: align zcomp interface to crypto comp API

From: Sergey Senozhatsky
Date: Wed May 25 2016 - 09:33:55 EST


A cosmetic change: use the same datatypes as crypto API does.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
---
drivers/block/zram/zcomp.c | 5 ++---
drivers/block/zram/zcomp.h | 5 ++---
drivers/block/zram/zram_drv.c | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
index 6e16fa2..79b30d7 100644
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
@@ -103,7 +103,7 @@ void zcomp_stream_put(struct zcomp *comp)
}

int zcomp_compress(struct zcomp_strm *zstrm,
- const unsigned char *src, unsigned int *dst_len)
+ const u8 *src, unsigned int *dst_len)
{
/*
* Our dst memory (zstrm->buffer) is always `2 * PAGE_SIZE' sized
@@ -127,8 +127,7 @@ int zcomp_compress(struct zcomp_strm *zstrm,
}

int zcomp_decompress(struct zcomp_strm *zstrm,
- const unsigned char *src,
- size_t src_len, unsigned char *dst)
+ const u8 *src, unsigned int src_len, u8 *dst)
{
unsigned int dst_len = PAGE_SIZE;

diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h
index 3fb9dc4..dcc0951 100644
--- a/drivers/block/zram/zcomp.h
+++ b/drivers/block/zram/zcomp.h
@@ -54,11 +54,10 @@ struct zcomp_strm *zcomp_stream_get(struct zcomp *comp);
void zcomp_stream_put(struct zcomp *comp);

int zcomp_compress(struct zcomp_strm *zstrm,
- const unsigned char *src, unsigned int *dst_len);
+ const u8 *src, unsigned int *dst_len);

int zcomp_decompress(struct zcomp_strm *zstrm,
- const unsigned char *src,
- size_t src_len, unsigned char *dst);
+ const u8 *src, unsigned int src_len, u8 *dst);

bool zcomp_set_max_streams(struct zcomp *comp, int num_strm);
#endif /* _ZCOMP_H_ */
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 99c8be7..65d1403 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -563,7 +563,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
unsigned char *cmem;
struct zram_meta *meta = zram->meta;
unsigned long handle;
- size_t size;
+ unsigned int size;

bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
handle = meta->table[index].handle;
--
2.8.3.394.g3916adf