crypto: lzo-rle - 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/lzo-rle.c b/crypto/lzo-rle.c
index 6c845e7d32f509a7286379ffeabb2e6c851ac476..b1350ae278b8f45a83a5f66e610de2e29c29a960 100644 (file)
--- a/crypto/lzo-rle.c
+++ b/crypto/lzo-rle.c
@@ -3,13 +3,11 @@
  * Cryptographic API.
  */
 
+#include <crypto/internal/scompress.h>
 #include <linux/init.h>
-#include <linux/module.h>
-#include <linux/crypto.h>
-#include <linux/vmalloc.h>
-#include <linux/mm.h>
 #include <linux/lzo.h>
-#include <crypto/internal/scompress.h>
+#include <linux/module.h>
+#include <linux/slab.h>
 
 struct lzorle_ctx {
        void *lzorle_comp_mem;
@@ -26,29 +24,11 @@ static void *lzorle_alloc_ctx(void)
        return ctx;
 }
 
-static int lzorle_init(struct crypto_tfm *tfm)
-{
-       struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       ctx->lzorle_comp_mem = lzorle_alloc_ctx();
-       if (IS_ERR(ctx->lzorle_comp_mem))
-               return -ENOMEM;
-
-       return 0;
-}
-
 static void lzorle_free_ctx(void *ctx)
 {
        kvfree(ctx);
 }
 
-static void lzorle_exit(struct crypto_tfm *tfm)
-{
-       struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       lzorle_free_ctx(ctx->lzorle_comp_mem);
-}
-
 static int __lzorle_compress(const u8 *src, unsigned int slen,
                          u8 *dst, unsigned int *dlen, void *ctx)
 {
@@ -64,14 +44,6 @@ static int __lzorle_compress(const u8 *src, unsigned int slen,
        return 0;
 }
 
-static int lzorle_compress(struct crypto_tfm *tfm, const u8 *src,
-                       unsigned int slen, u8 *dst, unsigned int *dlen)
-{
-       struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       return __lzorle_compress(src, slen, dst, dlen, ctx->lzorle_comp_mem);
-}
-
 static int lzorle_scompress(struct crypto_scomp *tfm, const u8 *src,
                         unsigned int slen, u8 *dst, unsigned int *dlen,
                         void *ctx)
@@ -94,12 +66,6 @@ static int __lzorle_decompress(const u8 *src, unsigned int slen,
        return 0;
 }
 
-static int lzorle_decompress(struct crypto_tfm *tfm, const u8 *src,
-                         unsigned int slen, u8 *dst, unsigned int *dlen)
-{
-       return __lzorle_decompress(src, slen, dst, dlen);
-}
-
 static int lzorle_sdecompress(struct crypto_scomp *tfm, const u8 *src,
                           unsigned int slen, u8 *dst, unsigned int *dlen,
                           void *ctx)
@@ -107,19 +73,6 @@ static int lzorle_sdecompress(struct crypto_scomp *tfm, const u8 *src,
        return __lzorle_decompress(src, slen, dst, dlen);
 }
 
-static struct crypto_alg alg = {
-       .cra_name               = "lzo-rle",
-       .cra_driver_name        = "lzo-rle-generic",
-       .cra_flags              = CRYPTO_ALG_TYPE_COMPRESS,
-       .cra_ctxsize            = sizeof(struct lzorle_ctx),
-       .cra_module             = THIS_MODULE,
-       .cra_init               = lzorle_init,
-       .cra_exit               = lzorle_exit,
-       .cra_u                  = { .compress = {
-       .coa_compress           = lzorle_compress,
-       .coa_decompress         = lzorle_decompress } }
-};
-
 static struct scomp_alg scomp = {
        .alloc_ctx              = lzorle_alloc_ctx,
        .free_ctx               = lzorle_free_ctx,
@@ -134,24 +87,11 @@ static struct scomp_alg scomp = {
 
 static int __init lzorle_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 ret;
+       return crypto_register_scomp(&scomp);
 }
 
 static void __exit lzorle_mod_fini(void)
 {
-       crypto_unregister_alg(&alg);
        crypto_unregister_scomp(&scomp);
 }