arm64: dts: rockchip: add otg-port node of usb2-phy for rk3328 dwc2

[firefly-linux-kernel-4.4.55.git] / crypto / zlib.c

diff --git a/crypto/zlib.c b/crypto/zlib.c
index 06b62e5cdcc72a93281051a7c07b5090be9abeaa..d51a30a29e421fe6a80af8d0ce0ec78b048fe5e5 100644 (file)
--- a/crypto/zlib.c
+++ b/crypto/zlib.c
@@ -78,7 +78,7 @@ static void zlib_exit(struct crypto_tfm *tfm)
 }
 
 
-static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
+static int zlib_compress_setup(struct crypto_pcomp *tfm, const void *params,
                               unsigned int len)
 {
        struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
@@ -168,7 +168,7 @@ static int zlib_compress_update(struct crypto_pcomp *tfm,
        }
 
        ret = req->avail_out - stream->avail_out;
-       pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",
+       pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
                 stream->avail_in, stream->avail_out,
                 req->avail_in - stream->avail_in, ret);
        req->next_in = stream->next_in;
@@ -198,7 +198,7 @@ static int zlib_compress_final(struct crypto_pcomp *tfm,
        }
 
        ret = req->avail_out - stream->avail_out;
-       pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",
+       pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
                 stream->avail_in, stream->avail_out,
                 req->avail_in - stream->avail_in, ret);
        req->next_in = stream->next_in;
@@ -209,7 +209,7 @@ static int zlib_compress_final(struct crypto_pcomp *tfm,
 }
 
 
-static int zlib_decompress_setup(struct crypto_pcomp *tfm, void *params,
+static int zlib_decompress_setup(struct crypto_pcomp *tfm, const void *params,
                                 unsigned int len)
 {
        struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
@@ -283,7 +283,7 @@ static int zlib_decompress_update(struct crypto_pcomp *tfm,
        }
 
        ret = req->avail_out - stream->avail_out;
-       pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",
+       pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
                 stream->avail_in, stream->avail_out,
                 req->avail_in - stream->avail_in, ret);
        req->next_in = stream->next_in;
@@ -331,7 +331,7 @@ static int zlib_decompress_final(struct crypto_pcomp *tfm,
        }
 
        ret = req->avail_out - stream->avail_out;
-       pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",
+       pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
                 stream->avail_in, stream->avail_out,
                 req->avail_in - stream->avail_in, ret);
        req->next_in = stream->next_in;
@@ -378,3 +378,4 @@ module_exit(zlib_mod_fini);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Zlib Compression Algorithm");
 MODULE_AUTHOR("Sony Corporation");
+MODULE_ALIAS_CRYPTO("zlib");