[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1389105685-25245-3-git-send-email-haver@linux.vnet.ibm.com>
Date: Tue, 7 Jan 2014 15:41:25 +0100
From: Frank Haverkamp <haver@...ux.vnet.ibm.com>
To: gregkh@...uxfoundation.org
Cc: linux-kernel@...r.kernel.org, linux-next@...r.kernel.org,
dan.carpenter@...cle.com, fengguang.wu@...el.com,
weiyj.lk@...il.com, jim.epost@...il.com, sfr@...b.auug.org.au,
jsvogt@...ibm.com, MIJUNG@...ibm.com, michael@...ra.de,
schwidefsky@...ibm.com, cody@...ux.vnet.ibm.com,
cascardo@...ux.vnet.ibm.com, kernel-janitors@...r.kernel.org,
haver@...ux.vnet.ibm.com
Subject: [PATCH 3/3] GenWQE: Fix warnings for sparc
dma_addr_t was not used, where it should have been used.
Some format strings were not optimal.
Reported-by: kbuild test robot <fengguang.wu@...el.com>
Signed-off-by: Frank Haverkamp <haver@...ux.vnet.ibm.com>
---
drivers/misc/genwqe/card_dev.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
--- a/drivers/misc/genwqe/card_dev.c
+++ b/drivers/misc/genwqe/card_dev.c
@@ -214,9 +214,9 @@ static void genwqe_remove_mappings(struc
*/
dev_err(&pci_dev->dev,
"[%s] %d. cleanup mapping: u_vaddr=%p "
- "u_kaddr=%016lx dma_addr=%llx\n", __func__, i++,
+ "u_kaddr=%016lx dma_addr=%lx\n", __func__, i++,
dma_map->u_vaddr, (unsigned long)dma_map->k_vaddr,
- dma_map->dma_addr);
+ (unsigned long)dma_map->dma_addr);
if (dma_map->type == GENWQE_MAPPING_RAW) {
/* we allocated this dynamically */
@@ -507,7 +507,8 @@ static int do_flash_update(struct genwqe
{
int rc = 0;
int blocks_to_flash;
- u64 dma_addr, flash = 0;
+ dma_addr_t dma_addr;
+ u64 flash = 0;
size_t tocopy = 0;
u8 __user *buf;
u8 *xbuf;
@@ -558,8 +559,9 @@ static int do_flash_update(struct genwqe
crc = genwqe_crc32(xbuf, tocopy, 0xffffffff);
dev_dbg(&pci_dev->dev,
- "[%s] DMA: 0x%llx CRC: %08x SZ: %ld %d\n",
- __func__, dma_addr, crc, tocopy, blocks_to_flash);
+ "[%s] DMA: %lx CRC: %08x SZ: %ld %d\n",
+ __func__, (unsigned long)dma_addr, crc, tocopy,
+ blocks_to_flash);
/* prepare DDCB for SLU process */
req = ddcb_requ_alloc();
@@ -638,7 +640,8 @@ static int do_flash_read(struct genwqe_f
struct genwqe_bitstream *load)
{
int rc, blocks_to_flash;
- u64 dma_addr, flash = 0;
+ dma_addr_t dma_addr;
+ u64 flash = 0;
size_t tocopy = 0;
u8 __user *buf;
u8 *xbuf;
@@ -680,8 +683,9 @@ static int do_flash_read(struct genwqe_f
tocopy = min_t(size_t, load->size, FLASH_BLOCK);
dev_dbg(&pci_dev->dev,
- "[%s] DMA: 0x%llx SZ: %ld %d\n",
- __func__, dma_addr, tocopy, blocks_to_flash);
+ "[%s] DMA: %lx SZ: %ld %d\n",
+ __func__, (unsigned long)dma_addr, tocopy,
+ blocks_to_flash);
/* prepare DDCB for SLU process */
cmd = ddcb_requ_alloc();
@@ -864,7 +868,8 @@ static int ddcb_cmd_fixups(struct genwqe
for (i = 0, asiv_offs = 0x00; asiv_offs <= 0x58;
i++, asiv_offs += 0x08) {
- u64 u_addr, d_addr;
+ u64 u_addr;
+ dma_addr_t d_addr;
u32 u_size = 0;
u64 ats_flags;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists