Merge tag 'drm-intel-fixes-2022-07-07' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-microblaze.git] / crypto / zstd.c

diff --git a/crypto/zstd.c b/crypto/zstd.c
index 1a3309f..154a969 100644 (file)
--- a/crypto/zstd.c
+++ b/crypto/zstd.c
@@ -18,22 +18,22 @@
 #define ZSTD_DEF_LEVEL 3
 
 struct zstd_ctx {
-       ZSTD_CCtx *cctx;
-       ZSTD_DCtx *dctx;
+       zstd_cctx *cctx;
+       zstd_dctx *dctx;
        void *cwksp;
        void *dwksp;
 };
 
-static ZSTD_parameters zstd_params(void)
+static zstd_parameters zstd_params(void)
 {
-       return ZSTD_getParams(ZSTD_DEF_LEVEL, 0, 0);
+       return zstd_get_params(ZSTD_DEF_LEVEL, 0);
 }
 
 static int zstd_comp_init(struct zstd_ctx *ctx)
 {
        int ret = 0;
-       const ZSTD_parameters params = zstd_params();
-       const size_t wksp_size = ZSTD_CCtxWorkspaceBound(params.cParams);
+       const zstd_parameters params = zstd_params();
+       const size_t wksp_size = zstd_cctx_workspace_bound(&params.cParams);
 
        ctx->cwksp = vzalloc(wksp_size);
        if (!ctx->cwksp) {
@@ -41,7 +41,7 @@ static int zstd_comp_init(struct zstd_ctx *ctx)
                goto out;
        }
 
-       ctx->cctx = ZSTD_initCCtx(ctx->cwksp, wksp_size);
+       ctx->cctx = zstd_init_cctx(ctx->cwksp, wksp_size);
        if (!ctx->cctx) {
                ret = -EINVAL;
                goto out_free;
@@ -56,7 +56,7 @@ out_free:
 static int zstd_decomp_init(struct zstd_ctx *ctx)
 {
        int ret = 0;
-       const size_t wksp_size = ZSTD_DCtxWorkspaceBound();
+       const size_t wksp_size = zstd_dctx_workspace_bound();
 
        ctx->dwksp = vzalloc(wksp_size);
        if (!ctx->dwksp) {
@@ -64,7 +64,7 @@ static int zstd_decomp_init(struct zstd_ctx *ctx)
                goto out;
        }
 
-       ctx->dctx = ZSTD_initDCtx(ctx->dwksp, wksp_size);
+       ctx->dctx = zstd_init_dctx(ctx->dwksp, wksp_size);
        if (!ctx->dctx) {
                ret = -EINVAL;
                goto out_free;
@@ -152,10 +152,10 @@ static int __zstd_compress(const u8 *src, unsigned int slen,
 {
        size_t out_len;
        struct zstd_ctx *zctx = ctx;
-       const ZSTD_parameters params = zstd_params();
+       const zstd_parameters params = zstd_params();
 
-       out_len = ZSTD_compressCCtx(zctx->cctx, dst, *dlen, src, slen, params);
-       if (ZSTD_isError(out_len))
+       out_len = zstd_compress_cctx(zctx->cctx, dst, *dlen, src, slen, &params);
+       if (zstd_is_error(out_len))
                return -EINVAL;
        *dlen = out_len;
        return 0;
@@ -182,8 +182,8 @@ static int __zstd_decompress(const u8 *src, unsigned int slen,
        size_t out_len;
        struct zstd_ctx *zctx = ctx;
 
-       out_len = ZSTD_decompressDCtx(zctx->dctx, dst, *dlen, src, slen);
-       if (ZSTD_isError(out_len))
+       out_len = zstd_decompress_dctx(zctx->dctx, dst, *dlen, src, slen);
+       if (zstd_is_error(out_len))
                return -EINVAL;
        *dlen = out_len;
        return 0;