2017-12-20 18:16:16

by Corentin LABBE

[permalink] [raw]
Subject: [PATCH] staging: ccree: fix __dump_byte_array() declaration mismatch

This patch corrects the type of the size argument in __dump_byte_array()
from unsigned long to size_t as done only in drivers/staging/ccree/ssi_driver.c

This fix also a build error:
drivers/staging/ccree/ssi_driver.c:82:6: error: conflicting types for '__dump_byte_array'

Fixes: 3f268f5d6669 ("staging: ccree: turn compile time debug log to params")
Signed-off-by: Corentin Labbe <[email protected]>
---
drivers/staging/ccree/ssi_driver.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h
index 5a56f7a76b71..0f57c9a8b8a6 100644
--- a/drivers/staging/ccree/ssi_driver.h
+++ b/drivers/staging/ccree/ssi_driver.h
@@ -174,8 +174,7 @@ static inline struct device *drvdata_to_dev(struct cc_drvdata *drvdata)
return &drvdata->plat_dev->dev;
}

-void __dump_byte_array(const char *name, const u8 *the_array,
- unsigned long size);
+void __dump_byte_array(const char *name, const u8 *buf, size_t size);
static inline void dump_byte_array(const char *name, const u8 *the_array,
unsigned long size)
{
--
2.13.6


2017-12-21 17:12:59

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] staging: ccree: fix __dump_byte_array() declaration mismatch

On Wed, Dec 20, 2017 at 06:16:08PM +0000, Corentin Labbe wrote:
> This patch corrects the type of the size argument in __dump_byte_array()
> from unsigned long to size_t as done only in drivers/staging/ccree/ssi_driver.c
>
> This fix also a build error:
> drivers/staging/ccree/ssi_driver.c:82:6: error: conflicting types for '__dump_byte_array'
>
> Fixes: 3f268f5d6669 ("staging: ccree: turn compile time debug log to params")
> Signed-off-by: Corentin Labbe <[email protected]>
> ---
> drivers/staging/ccree/ssi_driver.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

There's another warning here that Arnd's patches fixes, yet yours
didn't, so I'm going to take his patch, sorry.

greg k-h