Patchwork sata_fsl: Fix compile warnings

login
register
mail settings
Submitter Kumar Gala
Date May 13, 2009, 9:12 p.m.
Message ID <1242249131-25014-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/27164/
State Superseded
Headers show

Comments

Kumar Gala - May 13, 2009, 9:12 p.m.
We we build with dma_addr_t as a 64-bit quantity we get:

drivers/ata/sata_fsl.c: In function 'sata_fsl_fill_sg':
drivers/ata/sata_fsl.c:340: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 drivers/ata/sata_fsl.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Becky Bruce - May 13, 2009, 9:20 p.m.
On May 13, 2009, at 4:12 PM, Kumar Gala wrote:

> We we build with dma_addr_t as a 64-bit quantity we get:
>
> drivers/ata/sata_fsl.c: In function 'sata_fsl_fill_sg':
> drivers/ata/sata_fsl.c:340: warning: format '%x' expects type  
> 'unsigned int', but argument 4 has type 'dma_addr_t'
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> drivers/ata/sata_fsl.c |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
> index c2e90e1..c7ee52d 100644
> --- a/drivers/ata/sata_fsl.c
> +++ b/drivers/ata/sata_fsl.c
> @@ -332,13 +332,14 @@ static unsigned int sata_fsl_fill_sg(struct  
> ata_queued_cmd *qc, void *cmd_desc,
> 		dma_addr_t sg_addr = sg_dma_address(sg);
> 		u32 sg_len = sg_dma_len(sg);
>
> -		VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%x, sg_len = %d\n",
> -			sg_addr, sg_len);
> +		VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%llx, sg_len = %d\n",
> +			(unsigned long long)sg_addr, sg_len);
>
> 		/* warn if each s/g element is not dword aligned */
> 		if (sg_addr & 0x03)
> 			ata_port_printk(qc->ap, KERN_ERR,
> -					"s/g addr unaligned : 0x%x\n", sg_addr);
> +					"s/g addr unaligned : 0x%llxx\n",

You have an extra "x" in there....

Cheers,
B

Patch

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index c2e90e1..c7ee52d 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -332,13 +332,14 @@  static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,
 		dma_addr_t sg_addr = sg_dma_address(sg);
 		u32 sg_len = sg_dma_len(sg);
 
-		VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%x, sg_len = %d\n",
-			sg_addr, sg_len);
+		VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%llx, sg_len = %d\n",
+			(unsigned long long)sg_addr, sg_len);
 
 		/* warn if each s/g element is not dword aligned */
 		if (sg_addr & 0x03)
 			ata_port_printk(qc->ap, KERN_ERR,
-					"s/g addr unaligned : 0x%x\n", sg_addr);
+					"s/g addr unaligned : 0x%llxx\n", 
+					(unsigned long long)sg_addr);
 		if (sg_len & 0x03)
 			ata_port_printk(qc->ap, KERN_ERR,
 					"s/g len unaligned : 0x%x\n", sg_len);