[RFC PATCH 15/21] crypto: lzo - drop obsolete 'comp' implementation

[Ard Biesheuvel]

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

Signed-off-by: Ard Biesheuvel <a...@kernel.org>
---
 crypto/lzo.c | 60 +-------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

diff --git a/crypto/lzo.c b/crypto/lzo.c
index ebda132dd22bf543..52558f9d41f3dcea 100644
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -26,29 +26,11 @@ static void *lzo_alloc_ctx(struct crypto_scomp *tfm)
        return ctx;
 }
 
-static int lzo_init(struct crypto_tfm *tfm)
-{
-       struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       ctx->lzo_comp_mem = lzo_alloc_ctx(NULL);
-       if (IS_ERR(ctx->lzo_comp_mem))
-               return -ENOMEM;
-
-       return 0;
-}
-
 static void lzo_free_ctx(struct crypto_scomp *tfm, void *ctx)
 {
        kvfree(ctx);
 }
 
-static void lzo_exit(struct crypto_tfm *tfm)
-{
-       struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       lzo_free_ctx(NULL, ctx->lzo_comp_mem);
-}
-
 static int __lzo_compress(const u8 *src, unsigned int slen,
                          u8 *dst, unsigned int *dlen, void *ctx)
 {
@@ -64,14 +46,6 @@ static int __lzo_compress(const u8 *src, unsigned int slen,
        return 0;
 }
 
-static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
-                       unsigned int slen, u8 *dst, unsigned int *dlen)
-{
-       struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       return __lzo_compress(src, slen, dst, dlen, ctx->lzo_comp_mem);
-}
-
 static int lzo_scompress(struct crypto_scomp *tfm, const u8 *src,
                         unsigned int slen, u8 *dst, unsigned int *dlen,
                         void *ctx)
@@ -94,12 +68,6 @@ static int __lzo_decompress(const u8 *src, unsigned int slen,
        return 0;
 }
 
-static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,
-                         unsigned int slen, u8 *dst, unsigned int *dlen)
-{
-       return __lzo_decompress(src, slen, dst, dlen);
-}
-
 static int lzo_sdecompress(struct crypto_scomp *tfm, const u8 *src,
                           unsigned int slen, u8 *dst, unsigned int *dlen,
                           void *ctx)
@@ -107,19 +75,6 @@ static int lzo_sdecompress(struct crypto_scomp *tfm, const 
u8 *src,
        return __lzo_decompress(src, slen, dst, dlen);
 }
 
-static struct crypto_alg alg = {
-       .cra_name               = "lzo",
-       .cra_driver_name        = "lzo-generic",
-       .cra_flags              = CRYPTO_ALG_TYPE_COMPRESS,
-       .cra_ctxsize            = sizeof(struct lzo_ctx),
-       .cra_module             = THIS_MODULE,
-       .cra_init               = lzo_init,
-       .cra_exit               = lzo_exit,
-       .cra_u                  = { .compress = {
-       .coa_compress           = lzo_compress,
-       .coa_decompress         = lzo_decompress } }
-};
-
 static struct scomp_alg scomp = {
        .alloc_ctx              = lzo_alloc_ctx,
        .free_ctx               = lzo_free_ctx,
@@ -134,24 +89,11 @@ static struct scomp_alg scomp = {
 
 static int __init lzo_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 lzo_mod_fini(void)
 {
-       crypto_unregister_alg(&alg);
        crypto_unregister_scomp(&scomp);
 }
 
-- 
2.39.2