2 files changed, 9 insertions, 7 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 3ddc85e6efd6..55562019acf8 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1892,7 +1892,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
                 slot->SG[i].ins = bS_to_host(SCRIPT_RETURN);
                 slot->SG[i].pAddr = 0;
                 dma_cache_sync(hostdata->dev, slot->SG, sizeof(slot->SG), DMA_TO_DEVICE);
-                DEBUG((" SETTING %08lx to %x\n",
+                DEBUG((" SETTING %p to %x\n",
                        (&slot->pSG[i].ins),
                        slot->SG[i].ins));
         }
diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h
index e06bdfeab420..c893a5d3ff8d 100644
--- a/drivers/scsi/53c700.h
+++ b/drivers/scsi/53c700.h
@@ -423,23 +423,25 @@ struct NCR_700_Host_Parameters {
 #define script_patch_32(dev, script, symbol, value) \
 { \
         int i; \
+        dma_addr_t da = value; \
         for(i=0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \
-                __u32 val = bS_to_cpu((script)[A_##symbol##_used[i]]) + value; \
+                __u32 val = bS_to_cpu((script)[A_##symbol##_used[i]]) + da; \
                 (script)[A_##symbol##_used[i]] = bS_to_host(val); \
                 dma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEVICE); \
-                DEBUG((" script, patching %s at %d to 0x%lx\n", \
-                       #symbol, A_##symbol##_used[i], (value))); \
+                DEBUG((" script, patching %s at %d to %pad\n", \
+                       #symbol, A_##symbol##_used[i], &da)); \
         } \
 }
 
 #define script_patch_32_abs(dev, script, symbol, value) \
 { \
         int i; \
+        dma_addr_t da = value; \
         for(i=0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \
-                (script)[A_##symbol##_used[i]] = bS_to_host(value); \
+                (script)[A_##symbol##_used[i]] = bS_to_host(da); \
                 dma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEVICE); \
-                DEBUG((" script, patching %s at %d to 0x%lx\n", \
-                       #symbol, A_##symbol##_used[i], (value))); \
+                DEBUG((" script, patching %s at %d to %pad\n", \
+                       #symbol, A_##symbol##_used[i], &da)); \
         } \
 }