diff for duplicates of <20160610203945.GA18046@p100.box> diff --git a/a/1.txt b/N1/1.txt index 70f3146..ec887be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,9 @@ When enabling the debug options NCR_700_DEBUG and NCR_700_TAG_DEBUG various printk format warnings can be seen like: -drivers/scsi/53c700.c:357:2: warning: format =E2=80=98%p=E2=80=99 expec= -ts argument of type =E2=80=98void *=E2=80=99, but argument 4 has type =E2= -=80=98dma_addr_t=E2=80=99 [-Wformat=3D] +drivers/scsi/53c700.c:357:2: warning: format ‘%p’ expects argument of type ‘void *’, but argument 4 has type ‘dma_addr_t’ [-Wformat=] script_patch_32(hostdata->dev, script, MessageLocation, -=46ix them by using the right printk format specifiers. +Fix them by using the right printk format specifiers. Signed-off-by: Helge Deller <deller@gmx.de> @@ -13,12 +11,10 @@ diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index d4c2856..56bec27 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c -@@ -1892,7 +1892,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, v= -oid (*done)(struct scsi_cmnd *) - slot->SG[i].ins =3D bS_to_host(SCRIPT_RETURN); - slot->SG[i].pAddr =3D 0; - dma_cache_sync(hostdata->dev, slot->SG, sizeof(slot->SG), DMA_TO_DEV= -ICE); +@@ -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), @@ -32,38 +28,35 @@ index e06bdfe..fd32971 100644 #define script_patch_32(dev, script, symbol, value) \ { \ int i; \ -+ dma_addr_t da =3D value; \ - for(i=3D0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \ -- __u32 val =3D bS_to_cpu((script)[A_##symbol##_used[i]]) + value; \ -+ __u32 val =3D bS_to_cpu((script)[A_##symbol##_used[i]]) + da; \ - (script)[A_##symbol##_used[i]] =3D bS_to_host(val); \ - dma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEV= -ICE); \ ++ 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)); \ } \ } -=20 + #define script_patch_32_abs(dev, script, symbol, value) \ { \ int i; \ -+ dma_addr_t da =3D value; \ - for(i=3D0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \ -- (script)[A_##symbol##_used[i]] =3D bS_to_host(value); \ -+ (script)[A_##symbol##_used[i]] =3D bS_to_host(da); \ - dma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEV= -ICE); \ ++ 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)); \ } \ } -=20 + -- -To unsubscribe from this list: send the line "unsubscribe linux-parisc"= - in +To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9c0d280..dead8da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,12 +8,10 @@ "b\0" "When enabling the debug options NCR_700_DEBUG and NCR_700_TAG_DEBUG\n" "various printk format warnings can be seen like:\n" - "drivers/scsi/53c700.c:357:2: warning: format =E2=80=98%p=E2=80=99 expec=\n" - "ts argument of type =E2=80=98void *=E2=80=99, but argument 4 has type =E2=\n" - "=80=98dma_addr_t=E2=80=99 [-Wformat=3D]\n" + "drivers/scsi/53c700.c:357:2: warning: format \342\200\230%p\342\200\231 expects argument of type \342\200\230void *\342\200\231, but argument 4 has type \342\200\230dma_addr_t\342\200\231 [-Wformat=]\n" " script_patch_32(hostdata->dev, script, MessageLocation,\n" "\n" - "=46ix them by using the right printk format specifiers.\n" + "Fix them by using the right printk format specifiers.\n" "\n" "Signed-off-by: Helge Deller <deller@gmx.de>\n" "\n" @@ -21,12 +19,10 @@ "index d4c2856..56bec27 100644\n" "--- a/drivers/scsi/53c700.c\n" "+++ b/drivers/scsi/53c700.c\n" - "@@ -1892,7 +1892,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, v=\n" - "oid (*done)(struct scsi_cmnd *)\n" - " \t\tslot->SG[i].ins =3D bS_to_host(SCRIPT_RETURN);\n" - " \t\tslot->SG[i].pAddr =3D 0;\n" - " \t\tdma_cache_sync(hostdata->dev, slot->SG, sizeof(slot->SG), DMA_TO_DEV=\n" - "ICE);\n" + "@@ -1892,7 +1892,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)\n" + " \t\tslot->SG[i].ins = bS_to_host(SCRIPT_RETURN);\n" + " \t\tslot->SG[i].pAddr = 0;\n" + " \t\tdma_cache_sync(hostdata->dev, slot->SG, sizeof(slot->SG), DMA_TO_DEVICE);\n" "-\t\tDEBUG((\" SETTING %08lx to %x\\n\",\n" "+\t\tDEBUG((\" SETTING %p to %x\\n\",\n" " \t\t (&slot->pSG[i].ins),\n" @@ -40,40 +36,37 @@ " #define script_patch_32(dev, script, symbol, value) \\\n" " { \\\n" " \tint i; \\\n" - "+\tdma_addr_t da =3D value; \\\n" - " \tfor(i=3D0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \\\n" - "-\t\t__u32 val =3D bS_to_cpu((script)[A_##symbol##_used[i]]) + value; \\\n" - "+\t\t__u32 val =3D bS_to_cpu((script)[A_##symbol##_used[i]]) + da; \\\n" - " \t\t(script)[A_##symbol##_used[i]] =3D bS_to_host(val); \\\n" - " \t\tdma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEV=\n" - "ICE); \\\n" + "+\tdma_addr_t da = value; \\\n" + " \tfor(i=0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \\\n" + "-\t\t__u32 val = bS_to_cpu((script)[A_##symbol##_used[i]]) + value; \\\n" + "+\t\t__u32 val = bS_to_cpu((script)[A_##symbol##_used[i]]) + da; \\\n" + " \t\t(script)[A_##symbol##_used[i]] = bS_to_host(val); \\\n" + " \t\tdma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEVICE); \\\n" "-\t\tDEBUG((\" script, patching %s at %d to 0x%lx\\n\", \\\n" "-\t\t #symbol, A_##symbol##_used[i], (value))); \\\n" "+\t\tDEBUG((\" script, patching %s at %d to %pad\\n\", \\\n" "+\t\t #symbol, A_##symbol##_used[i], &da)); \\\n" " \t} \\\n" " }\n" - "=20\n" + " \n" " #define script_patch_32_abs(dev, script, symbol, value) \\\n" " { \\\n" " \tint i; \\\n" - "+\tdma_addr_t da =3D value; \\\n" - " \tfor(i=3D0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \\\n" - "-\t\t(script)[A_##symbol##_used[i]] =3D bS_to_host(value); \\\n" - "+\t\t(script)[A_##symbol##_used[i]] =3D bS_to_host(da); \\\n" - " \t\tdma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEV=\n" - "ICE); \\\n" + "+\tdma_addr_t da = value; \\\n" + " \tfor(i=0; i< (sizeof(A_##symbol##_used) / sizeof(__u32)); i++) { \\\n" + "-\t\t(script)[A_##symbol##_used[i]] = bS_to_host(value); \\\n" + "+\t\t(script)[A_##symbol##_used[i]] = bS_to_host(da); \\\n" + " \t\tdma_cache_sync((dev), &(script)[A_##symbol##_used[i]], 4, DMA_TO_DEVICE); \\\n" "-\t\tDEBUG((\" script, patching %s at %d to 0x%lx\\n\", \\\n" "-\t\t #symbol, A_##symbol##_used[i], (value))); \\\n" "+\t\tDEBUG((\" script, patching %s at %d to %pad\\n\", \\\n" "+\t\t #symbol, A_##symbol##_used[i], &da)); \\\n" " \t} \\\n" " }\n" - "=20\n" + " \n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\"=\n" - " in\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\" in\n" "the body of a message to majordomo@vger.kernel.org\n" More majordomo info at http://vger.kernel.org/majordomo-info.html -11d75bcf1addcfcb419dfe69987f1597087192aad025b7f1577df5107f715419 +e9bf1a723f08ce3373146772c9b2dc076403642eda0201f5de93248272901718
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.