crypto: lz4hc - drop obsolete 'comp' implementation

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

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index 25a95b65aca539369cc75cb1248c4d2da57d2c74..997e76c0183a66a96a415671910233d270d24853 100644 (file)
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -4,12 +4,11 @@
  *
  * Copyright (c) 2013 Chanho Min <chanho.min@lge.com>
  */
+#include <crypto/internal/scompress.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/crypto.h>
 #include <linux/vmalloc.h>
 #include <linux/lz4.h>
-#include <crypto/internal/scompress.h>
 
 struct lz4hc_ctx {
        void *lz4hc_comp_mem;
@@ -26,29 +25,11 @@ static void *lz4hc_alloc_ctx(void)
        return ctx;
 }
 
-static int lz4hc_init(struct crypto_tfm *tfm)
-{
-       struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       ctx->lz4hc_comp_mem = lz4hc_alloc_ctx();
-       if (IS_ERR(ctx->lz4hc_comp_mem))
-               return -ENOMEM;
-
-       return 0;
-}
-
 static void lz4hc_free_ctx(void *ctx)
 {
        vfree(ctx);
 }
 
-static void lz4hc_exit(struct crypto_tfm *tfm)
-{
-       struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       lz4hc_free_ctx(ctx->lz4hc_comp_mem);
-}
-
 static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,
                                   u8 *dst, unsigned int *dlen, void *ctx)
 {
@@ -69,16 +50,6 @@ static int lz4hc_scompress(struct crypto_scomp *tfm, const u8 *src,
        return __lz4hc_compress_crypto(src, slen, dst, dlen, ctx);
 }
 
-static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
-                                unsigned int slen, u8 *dst,
-                                unsigned int *dlen)
-{
-       struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       return __lz4hc_compress_crypto(src, slen, dst, dlen,
-                                       ctx->lz4hc_comp_mem);
-}
-
 static int __lz4hc_decompress_crypto(const u8 *src, unsigned int slen,
                                     u8 *dst, unsigned int *dlen, void *ctx)
 {
@@ -98,26 +69,6 @@ static int lz4hc_sdecompress(struct crypto_scomp *tfm, const u8 *src,
        return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);
 }
 
-static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
-                                  unsigned int slen, u8 *dst,
-                                  unsigned int *dlen)
-{
-       return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);
-}
-
-static struct crypto_alg alg_lz4hc = {
-       .cra_name               = "lz4hc",
-       .cra_driver_name        = "lz4hc-generic",
-       .cra_flags              = CRYPTO_ALG_TYPE_COMPRESS,
-       .cra_ctxsize            = sizeof(struct lz4hc_ctx),
-       .cra_module             = THIS_MODULE,
-       .cra_init               = lz4hc_init,
-       .cra_exit               = lz4hc_exit,
-       .cra_u                  = { .compress = {
-       .coa_compress           = lz4hc_compress_crypto,
-       .coa_decompress         = lz4hc_decompress_crypto } }
-};
-
 static struct scomp_alg scomp = {
        .alloc_ctx              = lz4hc_alloc_ctx,
        .free_ctx               = lz4hc_free_ctx,
@@ -132,24 +83,11 @@ static struct scomp_alg scomp = {
 
 static int __init lz4hc_mod_init(void)
 {
-       int ret;
-
-       ret = crypto_register_alg(&alg_lz4hc);
-       if (ret)
-               return ret;
-
-       ret = crypto_register_scomp(&scomp);
-       if (ret) {
-               crypto_unregister_alg(&alg_lz4hc);
-               return ret;
-       }
-
-       return ret;
+       return crypto_register_scomp(&scomp);
 }
 
 static void __exit lz4hc_mod_fini(void)
 {
-       crypto_unregister_alg(&alg_lz4hc);
        crypto_unregister_scomp(&scomp);
 }