diff mbox

[U-Boot,1/2] qe: transform parameter to compatible type

Message ID 1430812413-7633-1-git-send-email-B45475@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Zhao Qiang May 5, 2015, 7:53 a.m. UTC
when using printf, the parameter type need to be compatible
type, so transform them to compatible type

Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
 drivers/qe/qe.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

York Sun June 29, 2015, 6:27 p.m. UTC | #1
On 05/05/2015 12:53 AM, Zhao Qiang wrote:
> when using printf, the parameter type need to be compatible
> type, so transform them to compatible type
> 
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---
>  drivers/qe/qe.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
> index 84e1433..f1df0a4 100644
> --- a/drivers/qe/qe.c
> +++ b/drivers/qe/qe.c
> @@ -313,9 +313,10 @@ static void qe_upload_microcode(const void *base,
>  
>  	if (ucode->major || ucode->minor || ucode->revision)
>  		printf("QE: uploading microcode '%s' version %u.%u.%u\n",
> -			ucode->id, ucode->major, ucode->minor, ucode->revision);
> +		       (char *)ucode->id, (u16)ucode->major, (u16)ucode->minor,
> +		       (u16)ucode->revision);
>  	else
> -		printf("QE: uploading microcode '%s'\n", ucode->id);
> +		printf("QE: uploading microcode '%s'\n", (char *)ucode->id);
>  

Would it be more appropriate to fix the structure in qe.h?
Is the size fixed for major and minor? They are declared as u8. I can't find
doc/README.qe_firmware as mentioned in the comment.

York
York Sun Aug. 4, 2015, 3:44 p.m. UTC | #2
On 05/05/2015 12:53 AM, Zhao Qiang wrote:
> when using printf, the parameter type need to be compatible
> type, so transform them to compatible type
> 
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---

Applied to u-boot-fsl-qoriq master. Thanks.

York
diff mbox

Patch

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 84e1433..f1df0a4 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -313,9 +313,10 @@  static void qe_upload_microcode(const void *base,
 
 	if (ucode->major || ucode->minor || ucode->revision)
 		printf("QE: uploading microcode '%s' version %u.%u.%u\n",
-			ucode->id, ucode->major, ucode->minor, ucode->revision);
+		       (char *)ucode->id, (u16)ucode->major, (u16)ucode->minor,
+		       (u16)ucode->revision);
 	else
-		printf("QE: uploading microcode '%s'\n", ucode->id);
+		printf("QE: uploading microcode '%s'\n", (char *)ucode->id);
 
 	/* Use auto-increment */
 	out_be32(&qe_immr->iram.iadd, be32_to_cpu(ucode->iram_offset) |