Commit 0af7304c authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: scomp - Remove tfm argument from alloc/free_ctx 



The tfm argument is completely unused and meaningless as the
same stream object is identical over all transforms of a given
algorithm.  Remove it.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3d6979bf

crypto/842.c

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct crypto842_ctx { 
	void *wmem;	/* working memory for compress */

};



static void *crypto842_alloc_ctx(struct crypto_scomp *tfm)

static void *crypto842_alloc_ctx(void)

{

	void *ctx;
@@ -43,14 +43,14 @@ static int crypto842_init(struct crypto_tfm *tfm) 
{

	struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);



	ctx->wmem = crypto842_alloc_ctx(NULL);

	ctx->wmem = crypto842_alloc_ctx();

	if (IS_ERR(ctx->wmem))

		return -ENOMEM;



	return 0;

}



static void crypto842_free_ctx(struct crypto_scomp *tfm, void *ctx)

static void crypto842_free_ctx(void *ctx)

{

	kfree(ctx);

}
@@ -59,7 +59,7 @@ static void crypto842_exit(struct crypto_tfm *tfm) 
{

	struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);



	crypto842_free_ctx(NULL, ctx->wmem);

	crypto842_free_ctx(ctx->wmem);

}



static int crypto842_compress(struct crypto_tfm *tfm,

crypto/deflate.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int __deflate_init(void *ctx) 
	return ret;

}



static void *deflate_alloc_ctx(struct crypto_scomp *tfm)

static void *deflate_alloc_ctx(void)

{

	struct deflate_ctx *ctx;

	int ret;
@@ -143,7 +143,7 @@ static void __deflate_exit(void *ctx) 
	deflate_decomp_exit(ctx);

}



static void deflate_free_ctx(struct crypto_scomp *tfm, void *ctx)

static void deflate_free_ctx(void *ctx)

{

	__deflate_exit(ctx);

	kfree_sensitive(ctx);

crypto/lz4.c

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct lz4_ctx { 
	void *lz4_comp_mem;

};



static void *lz4_alloc_ctx(struct crypto_scomp *tfm)

static void *lz4_alloc_ctx(void)

{

	void *ctx;
@@ -31,14 +31,14 @@ static int lz4_init(struct crypto_tfm *tfm) 
{

	struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);



	ctx->lz4_comp_mem = lz4_alloc_ctx(NULL);

	ctx->lz4_comp_mem = lz4_alloc_ctx();

	if (IS_ERR(ctx->lz4_comp_mem))

		return -ENOMEM;



	return 0;

}



static void lz4_free_ctx(struct crypto_scomp *tfm, void *ctx)

static void lz4_free_ctx(void *ctx)

{

	vfree(ctx);

}
@@ -47,7 +47,7 @@ static void lz4_exit(struct crypto_tfm *tfm) 
{

	struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);



	lz4_free_ctx(NULL, ctx->lz4_comp_mem);

	lz4_free_ctx(ctx->lz4_comp_mem);

}



static int __lz4_compress_crypto(const u8 *src, unsigned int slen,

crypto/lz4hc.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct lz4hc_ctx { 
	void *lz4hc_comp_mem;

};



static void *lz4hc_alloc_ctx(struct crypto_scomp *tfm)

static void *lz4hc_alloc_ctx(void)

{

	void *ctx;
@@ -30,14 +30,14 @@ static int lz4hc_init(struct crypto_tfm *tfm) 
{

	struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);



	ctx->lz4hc_comp_mem = lz4hc_alloc_ctx(NULL);

	ctx->lz4hc_comp_mem = lz4hc_alloc_ctx();

	if (IS_ERR(ctx->lz4hc_comp_mem))

		return -ENOMEM;



	return 0;

}



static void lz4hc_free_ctx(struct crypto_scomp *tfm, void *ctx)

static void lz4hc_free_ctx(void *ctx)

{

	vfree(ctx);

}
@@ -46,7 +46,7 @@ static void lz4hc_exit(struct crypto_tfm *tfm) 
{

	struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);



	lz4hc_free_ctx(NULL, ctx->lz4hc_comp_mem);

	lz4hc_free_ctx(ctx->lz4hc_comp_mem);

}



static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,

crypto/lzo-rle.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct lzorle_ctx { 
	void *lzorle_comp_mem;

};



static void *lzorle_alloc_ctx(struct crypto_scomp *tfm)

static void *lzorle_alloc_ctx(void)

{

	void *ctx;
@@ -30,14 +30,14 @@ static int lzorle_init(struct crypto_tfm *tfm) 
{

	struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);



	ctx->lzorle_comp_mem = lzorle_alloc_ctx(NULL);

	ctx->lzorle_comp_mem = lzorle_alloc_ctx();

	if (IS_ERR(ctx->lzorle_comp_mem))

		return -ENOMEM;



	return 0;

}



static void lzorle_free_ctx(struct crypto_scomp *tfm, void *ctx)

static void lzorle_free_ctx(void *ctx)

{

	kvfree(ctx);

}
@@ -46,7 +46,7 @@ static void lzorle_exit(struct crypto_tfm *tfm) 
{

	struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);



	lzorle_free_ctx(NULL, ctx->lzorle_comp_mem);

	lzorle_free_ctx(ctx->lzorle_comp_mem);

}



static int __lzorle_compress(const u8 *src, unsigned int slen,