lkml.org 
[lkml]   [2023]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 17/21] crypto: cavium/zip - drop obsolete 'comp' implementation
    Date
    The 'comp' API is obsolete and will be removed, so remove this comp
    implementation.

    Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
    ---
    drivers/crypto/cavium/zip/zip_crypto.c | 40 ----------------
    drivers/crypto/cavium/zip/zip_crypto.h | 10 ----
    drivers/crypto/cavium/zip/zip_main.c | 50 +-------------------
    3 files changed, 1 insertion(+), 99 deletions(-)

    diff --git a/drivers/crypto/cavium/zip/zip_crypto.c b/drivers/crypto/cavium/zip/zip_crypto.c
    index 1046a746d36f551c..5edad3b1d1dc8398 100644
    --- a/drivers/crypto/cavium/zip/zip_crypto.c
    +++ b/drivers/crypto/cavium/zip/zip_crypto.c
    @@ -195,46 +195,6 @@ static int zip_decompress(const u8 *src, unsigned int slen,
    return ret;
    }

    -/* Legacy Compress framework start */
    -int zip_alloc_comp_ctx_deflate(struct crypto_tfm *tfm)
    -{
    - struct zip_kernel_ctx *zip_ctx = crypto_tfm_ctx(tfm);
    -
    - return zip_ctx_init(zip_ctx, 0);
    -}
    -
    -int zip_alloc_comp_ctx_lzs(struct crypto_tfm *tfm)
    -{
    - struct zip_kernel_ctx *zip_ctx = crypto_tfm_ctx(tfm);
    -
    - return zip_ctx_init(zip_ctx, 1);
    -}
    -
    -void zip_free_comp_ctx(struct crypto_tfm *tfm)
    -{
    - struct zip_kernel_ctx *zip_ctx = crypto_tfm_ctx(tfm);
    -
    - zip_ctx_exit(zip_ctx);
    -}
    -
    -int zip_comp_compress(struct crypto_tfm *tfm,
    - const u8 *src, unsigned int slen,
    - u8 *dst, unsigned int *dlen)
    -{
    - struct zip_kernel_ctx *zip_ctx = crypto_tfm_ctx(tfm);
    -
    - return zip_compress(src, slen, dst, dlen, zip_ctx);
    -}
    -
    -int zip_comp_decompress(struct crypto_tfm *tfm,
    - const u8 *src, unsigned int slen,
    - u8 *dst, unsigned int *dlen)
    -{
    - struct zip_kernel_ctx *zip_ctx = crypto_tfm_ctx(tfm);
    -
    - return zip_decompress(src, slen, dst, dlen, zip_ctx);
    -} /* Legacy compress framework end */
    -
    /* SCOMP framework start */
    void *zip_alloc_scomp_ctx_deflate(struct crypto_scomp *tfm)
    {
    diff --git a/drivers/crypto/cavium/zip/zip_crypto.h b/drivers/crypto/cavium/zip/zip_crypto.h
    index b59ddfcacd34447e..a1ae3825fb65c3b6 100644
    --- a/drivers/crypto/cavium/zip/zip_crypto.h
    +++ b/drivers/crypto/cavium/zip/zip_crypto.h
    @@ -57,16 +57,6 @@ struct zip_kernel_ctx {
    struct zip_operation zip_decomp;
    };

    -int zip_alloc_comp_ctx_deflate(struct crypto_tfm *tfm);
    -int zip_alloc_comp_ctx_lzs(struct crypto_tfm *tfm);
    -void zip_free_comp_ctx(struct crypto_tfm *tfm);
    -int zip_comp_compress(struct crypto_tfm *tfm,
    - const u8 *src, unsigned int slen,
    - u8 *dst, unsigned int *dlen);
    -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);
    diff --git a/drivers/crypto/cavium/zip/zip_main.c b/drivers/crypto/cavium/zip/zip_main.c
    index dc5b7bf7e1fd9867..abd58de4343ddd8e 100644
    --- a/drivers/crypto/cavium/zip/zip_main.c
    +++ b/drivers/crypto/cavium/zip/zip_main.c
    @@ -371,36 +371,6 @@ static struct pci_driver zip_driver = {

    /* Kernel Crypto Subsystem Interface */

    -static struct crypto_alg zip_comp_deflate = {
    - .cra_name = "deflate",
    - .cra_driver_name = "deflate-cavium",
    - .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
    - .cra_ctxsize = sizeof(struct zip_kernel_ctx),
    - .cra_priority = 300,
    - .cra_module = THIS_MODULE,
    - .cra_init = zip_alloc_comp_ctx_deflate,
    - .cra_exit = zip_free_comp_ctx,
    - .cra_u = { .compress = {
    - .coa_compress = zip_comp_compress,
    - .coa_decompress = zip_comp_decompress
    - } }
    -};
    -
    -static struct crypto_alg zip_comp_lzs = {
    - .cra_name = "lzs",
    - .cra_driver_name = "lzs-cavium",
    - .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
    - .cra_ctxsize = sizeof(struct zip_kernel_ctx),
    - .cra_priority = 300,
    - .cra_module = THIS_MODULE,
    - .cra_init = zip_alloc_comp_ctx_lzs,
    - .cra_exit = zip_free_comp_ctx,
    - .cra_u = { .compress = {
    - .coa_compress = zip_comp_compress,
    - .coa_decompress = zip_comp_decompress
    - } }
    -};
    -
    static struct scomp_alg zip_scomp_deflate = {
    .alloc_ctx = zip_alloc_scomp_ctx_deflate,
    .free_ctx = zip_free_scomp_ctx,
    @@ -431,22 +401,10 @@ static int zip_register_compression_device(void)
    {
    int ret;

    - ret = crypto_register_alg(&zip_comp_deflate);
    - if (ret < 0) {
    - zip_err("Deflate algorithm registration failed\n");
    - return ret;
    - }
    -
    - ret = crypto_register_alg(&zip_comp_lzs);
    - if (ret < 0) {
    - zip_err("LZS algorithm registration failed\n");
    - goto err_unregister_alg_deflate;
    - }
    -
    ret = crypto_register_scomp(&zip_scomp_deflate);
    if (ret < 0) {
    zip_err("Deflate scomp algorithm registration failed\n");
    - goto err_unregister_alg_lzs;
    + return ret;
    }

    ret = crypto_register_scomp(&zip_scomp_lzs);
    @@ -459,18 +417,12 @@ static int zip_register_compression_device(void)

    err_unregister_scomp_deflate:
    crypto_unregister_scomp(&zip_scomp_deflate);
    -err_unregister_alg_lzs:
    - crypto_unregister_alg(&zip_comp_lzs);
    -err_unregister_alg_deflate:
    - crypto_unregister_alg(&zip_comp_deflate);

    return ret;
    }

    static void zip_unregister_compression_device(void)
    {
    - crypto_unregister_alg(&zip_comp_deflate);
    - crypto_unregister_alg(&zip_comp_lzs);
    crypto_unregister_scomp(&zip_scomp_deflate);
    crypto_unregister_scomp(&zip_scomp_lzs);
    }
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-07-18 15:03    [W:2.579 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site