Commit 8beb4045 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: zstd - drop obsolete 'comp' implementation 



The 'comp' API is obsolete and will be removed, so remove this comp
implementation.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a3e43a25

crypto/zstd.c

+1 −55
Original line number Diff line number Diff line
@@ -121,13 +121,6 @@ static void *zstd_alloc_ctx(void) 
	return ctx;

}



static int zstd_init(struct crypto_tfm *tfm)

{

	struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);



	return __zstd_init(ctx);

}



static void __zstd_exit(void *ctx)

{

	zstd_comp_exit(ctx);
@@ -140,13 +133,6 @@ static void zstd_free_ctx(void *ctx) 
	kfree_sensitive(ctx);

}



static void zstd_exit(struct crypto_tfm *tfm)

{

	struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);



	__zstd_exit(ctx);

}



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

			   u8 *dst, unsigned int *dlen, void *ctx)

{
@@ -161,14 +147,6 @@ static int __zstd_compress(const u8 *src, unsigned int slen, 
	return 0;

}



static int zstd_compress(struct crypto_tfm *tfm, const u8 *src,

			 unsigned int slen, u8 *dst, unsigned int *dlen)

{

	struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);



	return __zstd_compress(src, slen, dst, dlen, ctx);

}



static int zstd_scompress(struct crypto_scomp *tfm, const u8 *src,

			  unsigned int slen, u8 *dst, unsigned int *dlen,

			  void *ctx)
@@ -189,14 +167,6 @@ static int __zstd_decompress(const u8 *src, unsigned int slen, 
	return 0;

}



static int zstd_decompress(struct crypto_tfm *tfm, const u8 *src,

			   unsigned int slen, u8 *dst, unsigned int *dlen)

{

	struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);



	return __zstd_decompress(src, slen, dst, dlen, ctx);

}



static int zstd_sdecompress(struct crypto_scomp *tfm, const u8 *src,

			    unsigned int slen, u8 *dst, unsigned int *dlen,

			    void *ctx)
@@ -204,19 +174,6 @@ static int zstd_sdecompress(struct crypto_scomp *tfm, const u8 *src, 
	return __zstd_decompress(src, slen, dst, dlen, ctx);

}



static struct crypto_alg alg = {

	.cra_name		= "zstd",

	.cra_driver_name	= "zstd-generic",

	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,

	.cra_ctxsize		= sizeof(struct zstd_ctx),

	.cra_module		= THIS_MODULE,

	.cra_init		= zstd_init,

	.cra_exit		= zstd_exit,

	.cra_u			= { .compress = {

	.coa_compress		= zstd_compress,

	.coa_decompress		= zstd_decompress } }

};



static struct scomp_alg scomp = {

	.alloc_ctx		= zstd_alloc_ctx,

	.free_ctx		= zstd_free_ctx,
@@ -231,22 +188,11 @@ static struct scomp_alg scomp = { 


static int __init zstd_mod_init(void)

{

	int ret;



	ret = crypto_register_alg(&alg);

	if (ret)

		return ret;



	ret = crypto_register_scomp(&scomp);

	if (ret)

		crypto_unregister_alg(&alg);



	return ret;

	return crypto_register_scomp(&scomp);

}



static void __exit zstd_mod_fini(void)

{

	crypto_unregister_alg(&alg);

	crypto_unregister_scomp(&scomp);

}