aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2009-05-13 23:10:50 -0400
committerJeff Garzik <jgarzik@redhat.com>2009-05-15 14:14:01 -0400
commitf48c019f1550aea7a3a1227efb9901916f5cd30d (patch)
tree6fef8859d92817bc46ac3fc46f1382fb7ce15f80 /drivers/ata
parent19799bfc5da476ad72eecc5f0f9018c5d351cbd5 (diff)
sata_fsl: Fix compile warnings
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> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_fsl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index c2e90e1fece0..5edd6549876d 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,
332 dma_addr_t sg_addr = sg_dma_address(sg); 332 dma_addr_t sg_addr = sg_dma_address(sg);
333 u32 sg_len = sg_dma_len(sg); 333 u32 sg_len = sg_dma_len(sg);
334 334
335 VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%x, sg_len = %d\n", 335 VPRINTK("SATA FSL : fill_sg, sg_addr = 0x%llx, sg_len = %d\n",
336 sg_addr, sg_len); 336 (unsigned long long)sg_addr, sg_len);
337 337
338 /* warn if each s/g element is not dword aligned */ 338 /* warn if each s/g element is not dword aligned */
339 if (sg_addr & 0x03) 339 if (sg_addr & 0x03)
340 ata_port_printk(qc->ap, KERN_ERR, 340 ata_port_printk(qc->ap, KERN_ERR,
341 "s/g addr unaligned : 0x%x\n", sg_addr); 341 "s/g addr unaligned : 0x%llx\n",
342 (unsigned long long)sg_addr);
342 if (sg_len & 0x03) 343 if (sg_len & 0x03)
343 ata_port_printk(qc->ap, KERN_ERR, 344 ata_port_printk(qc->ap, KERN_ERR,
344 "s/g len unaligned : 0x%x\n", sg_len); 345 "s/g len unaligned : 0x%x\n", sg_len);