crypto: zstd: Remove not backported scompress

The zstd was backported but there was build issue. Remove not
backported scompress from ztd.

Fixes: commit 147b60871fc2 ("zstd_support")
Ref: commit cc388d204f77 ("BACKPORT: crypto: zstd - Add zstd support") of https://android.googlesource.com/kernel/common
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: Icd35f40ed2295d26c26be8c82edad0108edd4ae0

diff --git a/crypto/zstd.c b/crypto/zstd.c
index 9a76b3e..9bfd28f 100644 (file)
--- a/crypto/zstd.c
+++ b/crypto/zstd.c
@@ -20,7 +20,6 @@
 #include <linux/net.h>
 #include <linux/vmalloc.h>
 #include <linux/zstd.h>
-#include <crypto/internal/scompress.h>
 
 
 #define ZSTD_DEF_LEVEL 3
@@ -111,24 +110,6 @@ static int __zstd_init(void *ctx)
        return ret;
 }
 
-static void *zstd_alloc_ctx(struct crypto_scomp *tfm)
-{
-       int ret;
-       struct zstd_ctx *ctx;
-
-       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-       if (!ctx)
-               return ERR_PTR(-ENOMEM);
-
-       ret = __zstd_init(ctx);
-       if (ret) {
-               kfree(ctx);
-               return ERR_PTR(ret);
-       }
-
-       return ctx;
-}
-
 static int zstd_init(struct crypto_tfm *tfm)
 {
        struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -142,12 +123,6 @@ static void __zstd_exit(void *ctx)
        zstd_decomp_exit(ctx);
 }
 
-static void zstd_free_ctx(struct crypto_scomp *tfm, void *ctx)
-{
-       __zstd_exit(ctx);
-       kzfree(ctx);
-}
-
 static void zstd_exit(struct crypto_tfm *tfm)
 {
        struct zstd_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -177,13 +152,6 @@ static int zstd_compress(struct crypto_tfm *tfm, const u8 *src,
        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)
-{
-       return __zstd_compress(src, slen, dst, dlen, ctx);
-}
-
 static int __zstd_decompress(const u8 *src, unsigned int slen,
                             u8 *dst, unsigned int *dlen, void *ctx)
 {
@@ -205,13 +173,6 @@ static int zstd_decompress(struct crypto_tfm *tfm, const u8 *src,
        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)
-{
-       return __zstd_decompress(src, slen, dst, dlen, ctx);
-}
-
 static struct crypto_alg alg = {
        .cra_name               = "zstd",
        .cra_flags              = CRYPTO_ALG_TYPE_COMPRESS,
@@ -224,18 +185,6 @@ static struct crypto_alg alg = {
        .coa_decompress         = zstd_decompress } }
 };
 
-static struct scomp_alg scomp = {
-       .alloc_ctx              = zstd_alloc_ctx,
-       .free_ctx               = zstd_free_ctx,
-       .compress               = zstd_scompress,
-       .decompress             = zstd_sdecompress,
-       .base                   = {
-               .cra_name       = "zstd",
-               .cra_driver_name = "zstd-scomp",
-               .cra_module      = THIS_MODULE,
-       }
-};
-
 static int __init zstd_mod_init(void)
 {
        int ret;
@@ -244,17 +193,12 @@ static int __init zstd_mod_init(void)
        if (ret)
                return ret;
 
-       ret = crypto_register_scomp(&scomp);
-       if (ret)
-               crypto_unregister_alg(&alg);
-
        return ret;
 }
 
 static void __exit zstd_mod_fini(void)
 {
        crypto_unregister_alg(&alg);
-       crypto_unregister_scomp(&scomp);
 }
 
 module_init(zstd_mod_init);