crypto: mxc-scc - fix build warnings on ARM64
authorFabio Estevam <festevam@gmail.com>
Thu, 13 Dec 2018 09:52:32 +0000 (07:52 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 14:37:47 +0000 (15:37 +0100)
[ Upstream commit 2326828ee40357b3d2b1359b8ca7526af201495b ]

The following build warnings are seen when building for ARM64 allmodconfig:

drivers/crypto/mxc-scc.c:181:20: warning: format '%d' expects argument of type 'int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Wformat=]
drivers/crypto/mxc-scc.c:186:21: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Wformat=]
drivers/crypto/mxc-scc.c:277:21: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Wformat=]
drivers/crypto/mxc-scc.c:339:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
drivers/crypto/mxc-scc.c:340:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Fix them by using the %zu specifier to print a size_t variable and using
a plain %x to print the result of a readl().

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/crypto/mxc-scc.c

index e01c46387df8d8823f4a9434ea0db3b9992583c4..519086730791b9ab53898e7f0464f0f3742cc552 100644 (file)
@@ -178,12 +178,12 @@ static int mxc_scc_get_data(struct mxc_scc_ctx *ctx,
        else
                from = scc->black_memory;
 
-       dev_dbg(scc->dev, "pcopy: from 0x%p %d bytes\n", from,
+       dev_dbg(scc->dev, "pcopy: from 0x%p %zu bytes\n", from,
                ctx->dst_nents * 8);
        len = sg_pcopy_from_buffer(ablkreq->dst, ctx->dst_nents,
                                   from, ctx->size, ctx->offset);
        if (!len) {
-               dev_err(scc->dev, "pcopy err from 0x%p (len=%d)\n", from, len);
+               dev_err(scc->dev, "pcopy err from 0x%p (len=%zu)\n", from, len);
                return -EINVAL;
        }
 
@@ -274,7 +274,7 @@ static int mxc_scc_put_data(struct mxc_scc_ctx *ctx,
        len = sg_pcopy_to_buffer(req->src, ctx->src_nents,
                                 to, len, ctx->offset);
        if (!len) {
-               dev_err(scc->dev, "pcopy err to 0x%p (len=%d)\n", to, len);
+               dev_err(scc->dev, "pcopy err to 0x%p (len=%zu)\n", to, len);
                return -EINVAL;
        }
 
@@ -335,9 +335,9 @@ static void mxc_scc_ablkcipher_next(struct mxc_scc_ctx *ctx,
                return;
        }
 
-       dev_dbg(scc->dev, "Start encryption (0x%p/0x%p)\n",
-               (void *)readl(scc->base + SCC_SCM_RED_START),
-               (void *)readl(scc->base + SCC_SCM_BLACK_START));
+       dev_dbg(scc->dev, "Start encryption (0x%x/0x%x)\n",
+               readl(scc->base + SCC_SCM_RED_START),
+               readl(scc->base + SCC_SCM_BLACK_START));
 
        /* clear interrupt control registers */
        writel(SCC_SCM_INTR_CTRL_CLR_INTR,