crypto: scomp - Remove tfm argument from alloc/free_ctx

The tfm argument is completely unused and meaningless as the
same stream object is identical over all transforms of a given
algorithm.  Remove it.

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

diff --git a/crypto/842.c b/crypto/842.c
index e59e54d769609ba6a881fcdfe6ada502d7627d27..2238478c349395d2eb92c4c472a1e7ee562a6f21 100644 (file)
--- a/crypto/842.c
+++ b/crypto/842.c
@@ -28,7 +28,7 @@ struct crypto842_ctx {
        void *wmem;     /* working memory for compress */
 };
 
-static void *crypto842_alloc_ctx(struct crypto_scomp *tfm)
+static void *crypto842_alloc_ctx(void)
 {
        void *ctx;
 
@@ -43,14 +43,14 @@ static int crypto842_init(struct crypto_tfm *tfm)
 {
        struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->wmem = crypto842_alloc_ctx(NULL);
+       ctx->wmem = crypto842_alloc_ctx();
        if (IS_ERR(ctx->wmem))
                return -ENOMEM;
 
        return 0;
 }
 
-static void crypto842_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void crypto842_free_ctx(void *ctx)
 {
        kfree(ctx);
 }
@@ -59,7 +59,7 @@ static void crypto842_exit(struct crypto_tfm *tfm)
 {
        struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       crypto842_free_ctx(NULL, ctx->wmem);
+       crypto842_free_ctx(ctx->wmem);
 }
 
 static int crypto842_compress(struct crypto_tfm *tfm,

diff --git a/crypto/deflate.c b/crypto/deflate.c
index 98e8bcb81a6aadf4cdda5770b3483eac02ee292e..1bf7184ad67031f89725acac40232141e1f19819 100644 (file)
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -112,7 +112,7 @@ out:
        return ret;
 }
 
-static void *deflate_alloc_ctx(struct crypto_scomp *tfm)
+static void *deflate_alloc_ctx(void)
 {
        struct deflate_ctx *ctx;
        int ret;
@@ -143,7 +143,7 @@ static void __deflate_exit(void *ctx)
        deflate_decomp_exit(ctx);
 }
 
-static void deflate_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void deflate_free_ctx(void *ctx)
 {
        __deflate_exit(ctx);
        kfree_sensitive(ctx);

diff --git a/crypto/lz4.c b/crypto/lz4.c
index 0606f8862e7872ad7ea876c23db09b94439dc984..e66c6d1ba34f8860e604e73e495eeaeeb5f1cd89 100644 (file)
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -16,7 +16,7 @@ struct lz4_ctx {
        void *lz4_comp_mem;
 };
 
-static void *lz4_alloc_ctx(struct crypto_scomp *tfm)
+static void *lz4_alloc_ctx(void)
 {
        void *ctx;
 
@@ -31,14 +31,14 @@ static int lz4_init(struct crypto_tfm *tfm)
 {
        struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->lz4_comp_mem = lz4_alloc_ctx(NULL);
+       ctx->lz4_comp_mem = lz4_alloc_ctx();
        if (IS_ERR(ctx->lz4_comp_mem))
                return -ENOMEM;
 
        return 0;
 }
 
-static void lz4_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void lz4_free_ctx(void *ctx)
 {
        vfree(ctx);
 }
@@ -47,7 +47,7 @@ static void lz4_exit(struct crypto_tfm *tfm)
 {
        struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       lz4_free_ctx(NULL, ctx->lz4_comp_mem);
+       lz4_free_ctx(ctx->lz4_comp_mem);
 }
 
 static int __lz4_compress_crypto(const u8 *src, unsigned int slen,

diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index d7cc94aa2fcf42fabe162272c8c2ac18cb7b8e4a..25a95b65aca539369cc75cb1248c4d2da57d2c74 100644 (file)
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -15,7 +15,7 @@ struct lz4hc_ctx {
        void *lz4hc_comp_mem;
 };
 
-static void *lz4hc_alloc_ctx(struct crypto_scomp *tfm)
+static void *lz4hc_alloc_ctx(void)
 {
        void *ctx;
 
@@ -30,14 +30,14 @@ static int lz4hc_init(struct crypto_tfm *tfm)
 {
        struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->lz4hc_comp_mem = lz4hc_alloc_ctx(NULL);
+       ctx->lz4hc_comp_mem = lz4hc_alloc_ctx();
        if (IS_ERR(ctx->lz4hc_comp_mem))
                return -ENOMEM;
 
        return 0;
 }
 
-static void lz4hc_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void lz4hc_free_ctx(void *ctx)
 {
        vfree(ctx);
 }
@@ -46,7 +46,7 @@ static void lz4hc_exit(struct crypto_tfm *tfm)
 {
        struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       lz4hc_free_ctx(NULL, ctx->lz4hc_comp_mem);
+       lz4hc_free_ctx(ctx->lz4hc_comp_mem);
 }
 
 static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,

diff --git a/crypto/lzo-rle.c b/crypto/lzo-rle.c
index 0abc2d87f04200c6b0088f65bbb966cc748ace72..6c845e7d32f509a7286379ffeabb2e6c851ac476 100644 (file)
--- a/crypto/lzo-rle.c
+++ b/crypto/lzo-rle.c
@@ -15,7 +15,7 @@ struct lzorle_ctx {
        void *lzorle_comp_mem;
 };
 
-static void *lzorle_alloc_ctx(struct crypto_scomp *tfm)
+static void *lzorle_alloc_ctx(void)
 {
        void *ctx;
 
@@ -30,14 +30,14 @@ static int lzorle_init(struct crypto_tfm *tfm)
 {
        struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->lzorle_comp_mem = lzorle_alloc_ctx(NULL);
+       ctx->lzorle_comp_mem = lzorle_alloc_ctx();
        if (IS_ERR(ctx->lzorle_comp_mem))
                return -ENOMEM;
 
        return 0;
 }
 
-static void lzorle_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void lzorle_free_ctx(void *ctx)
 {
        kvfree(ctx);
 }
@@ -46,7 +46,7 @@ static void lzorle_exit(struct crypto_tfm *tfm)
 {
        struct lzorle_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       lzorle_free_ctx(NULL, ctx->lzorle_comp_mem);
+       lzorle_free_ctx(ctx->lzorle_comp_mem);
 }
 
 static int __lzorle_compress(const u8 *src, unsigned int slen,

diff --git a/crypto/lzo.c b/crypto/lzo.c
index 8338851c7406a38414f053048714f2346bd88b12..035d62e2afe07cdd2a2fb111b2adb32aef193a57 100644 (file)
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -15,7 +15,7 @@ struct lzo_ctx {
        void *lzo_comp_mem;
 };
 
-static void *lzo_alloc_ctx(struct crypto_scomp *tfm)
+static void *lzo_alloc_ctx(void)
 {
        void *ctx;
 
@@ -30,14 +30,14 @@ static int lzo_init(struct crypto_tfm *tfm)
 {
        struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->lzo_comp_mem = lzo_alloc_ctx(NULL);
+       ctx->lzo_comp_mem = lzo_alloc_ctx();
        if (IS_ERR(ctx->lzo_comp_mem))
                return -ENOMEM;
 
        return 0;
 }
 
-static void lzo_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void lzo_free_ctx(void *ctx)
 {
        kvfree(ctx);
 }
@@ -46,7 +46,7 @@ static void lzo_exit(struct crypto_tfm *tfm)
 {
        struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       lzo_free_ctx(NULL, ctx->lzo_comp_mem);
+       lzo_free_ctx(ctx->lzo_comp_mem);
 }
 
 static int __lzo_compress(const u8 *src, unsigned int slen,

diff --git a/crypto/zstd.c b/crypto/zstd.c
index 154a969c83a82277d25a841b46ec2584d7361f58..68a093427944134d9d15a43fc071639d0625f101 100644 (file)
--- a/crypto/zstd.c
+++ b/crypto/zstd.c
@@ -103,7 +103,7 @@ static int __zstd_init(void *ctx)
        return ret;
 }
 
-static void *zstd_alloc_ctx(struct crypto_scomp *tfm)
+static void *zstd_alloc_ctx(void)
 {
        int ret;
        struct zstd_ctx *ctx;
@@ -134,7 +134,7 @@ static void __zstd_exit(void *ctx)
        zstd_decomp_exit(ctx);
 }
 
-static void zstd_free_ctx(struct crypto_scomp *tfm, void *ctx)
+static void zstd_free_ctx(void *ctx)
 {
        __zstd_exit(ctx);
        kfree_sensitive(ctx);

diff --git a/drivers/crypto/cavium/zip/zip_crypto.c b/drivers/crypto/cavium/zip/zip_crypto.c
index 1046a746d36f551c5ddf19726b8bac234c7bd969..a9c3efce8f2d581a529050ab80aad76af7bacd07 100644 (file)
--- a/drivers/crypto/cavium/zip/zip_crypto.c
+++ b/drivers/crypto/cavium/zip/zip_crypto.c
@@ -236,7 +236,7 @@ int  zip_comp_decompress(struct crypto_tfm *tfm,
 } /* Legacy compress framework end */
 
 /* SCOMP framework start */
-void *zip_alloc_scomp_ctx_deflate(struct crypto_scomp *tfm)
+void *zip_alloc_scomp_ctx_deflate(void)
 {
        int ret;
        struct zip_kernel_ctx *zip_ctx;
@@ -255,7 +255,7 @@ void *zip_alloc_scomp_ctx_deflate(struct crypto_scomp *tfm)
        return zip_ctx;
 }
 
-void *zip_alloc_scomp_ctx_lzs(struct crypto_scomp *tfm)
+void *zip_alloc_scomp_ctx_lzs(void)
 {
        int ret;
        struct zip_kernel_ctx *zip_ctx;
@@ -274,7 +274,7 @@ void *zip_alloc_scomp_ctx_lzs(struct crypto_scomp *tfm)
        return zip_ctx;
 }
 
-void zip_free_scomp_ctx(struct crypto_scomp *tfm, void *ctx)
+void zip_free_scomp_ctx(void *ctx)
 {
        struct zip_kernel_ctx *zip_ctx = ctx;
 

diff --git a/drivers/crypto/cavium/zip/zip_crypto.h b/drivers/crypto/cavium/zip/zip_crypto.h
index b59ddfcacd34447e0804a7b8ec6f5a8855f4581f..dbe20bfeb3e9acd4628460e49aaac636d9375fba 100644 (file)
--- a/drivers/crypto/cavium/zip/zip_crypto.h
+++ b/drivers/crypto/cavium/zip/zip_crypto.h
@@ -67,9 +67,9 @@ int  zip_comp_decompress(struct crypto_tfm *tfm,
                         const u8 *src, unsigned int slen,
                         u8 *dst, unsigned int *dlen);
 
-void *zip_alloc_scomp_ctx_deflate(struct crypto_scomp *tfm);
-void *zip_alloc_scomp_ctx_lzs(struct crypto_scomp *tfm);
-void  zip_free_scomp_ctx(struct crypto_scomp *tfm, void *zip_ctx);
+void *zip_alloc_scomp_ctx_deflate(void);
+void *zip_alloc_scomp_ctx_lzs(void);
+void  zip_free_scomp_ctx(void *zip_ctx);
 int   zip_scomp_compress(struct crypto_scomp *tfm,
                         const u8 *src, unsigned int slen,
                         u8 *dst, unsigned int *dlen, void *ctx);

diff --git a/include/crypto/internal/scompress.h b/include/crypto/internal/scompress.h
index 07a10fd2d3210a40b75a817cdb8e104ad115af0a..6ba9974df7d3b7a3038315c56fd8c60468075b07 100644 (file)
--- a/include/crypto/internal/scompress.h
+++ b/include/crypto/internal/scompress.h
@@ -31,8 +31,8 @@ struct crypto_scomp {
  * @calg:      Cmonn algorithm data structure shared with acomp
  */
 struct scomp_alg {
-       void *(*alloc_ctx)(struct crypto_scomp *tfm);
-       void (*free_ctx)(struct crypto_scomp *tfm, void *ctx);
+       void *(*alloc_ctx)(void);
+       void (*free_ctx)(void *ctx);
        int (*compress)(struct crypto_scomp *tfm, const u8 *src,
                        unsigned int slen, u8 *dst, unsigned int *dlen,
                        void *ctx);
@@ -73,13 +73,13 @@ static inline struct scomp_alg *crypto_scomp_alg(struct crypto_scomp *tfm)
 
 static inline void *crypto_scomp_alloc_ctx(struct crypto_scomp *tfm)
 {
-       return crypto_scomp_alg(tfm)->alloc_ctx(tfm);
+       return crypto_scomp_alg(tfm)->alloc_ctx();
 }
 
 static inline void crypto_scomp_free_ctx(struct crypto_scomp *tfm,
                                         void *ctx)
 {
-       return crypto_scomp_alg(tfm)->free_ctx(tfm, ctx);
+       return crypto_scomp_alg(tfm)->free_ctx(ctx);
 }
 
 static inline int crypto_scomp_compress(struct crypto_scomp *tfm,