sparc: fix format string argument for prom_printf()

prom_printf() takes printf style arguments.  Specifing GCC's format
attribute reveals that there are several wrong usages of prom_printf().

This fixes those wrong format strings and arguments, and also leaves
format attributes in order to detect similar mistakes at compile time.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index 27517879a6c2318176a0458078a3b81ead17df7b..c72f3045820ccf07866c7d4fe3a8fcd7bd4648f7 100644 (file)
--- a/arch/sparc/include/asm/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
@@ -94,7 +94,7 @@ extern int prom_getprev(void);
 extern void prom_console_write_buf(const char *buf, int len);
 
 /* Prom's internal routines, don't use in kernel/boot code. */
-extern void prom_printf(const char *fmt, ...);
+extern __printf(1, 2) void prom_printf(const char *fmt, ...);
 extern void prom_write(const char *buf, unsigned int len);
 
 /* Multiprocessor operations... */

diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index 97a90475c31478be1f20d870daf62469488934e6..a12dbe3b7762daf86e969401ad760a4b5305df60 100644 (file)
--- a/arch/sparc/include/asm/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
@@ -98,7 +98,7 @@ extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
 extern void prom_console_write_buf(const char *buf, int len);
 
 /* Prom's internal routines, don't use in kernel/boot code. */
-extern void prom_printf(const char *fmt, ...);
+extern __printf(1, 2) void prom_printf(const char *fmt, ...);
 extern void prom_write(const char *buf, unsigned int len);
 
 /* Multiprocessor operations... */

diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c
index 1032df43ec95869f9b3df643ec01c46c9ff5d723..c0a2de0fd62424914754e19885f3ec1abff1c44e 100644 (file)
--- a/arch/sparc/kernel/hvapi.c
+++ b/arch/sparc/kernel/hvapi.c
@@ -194,7 +194,7 @@ void __init sun4v_hvapi_init(void)
 
 bad:
        prom_printf("HVAPI: Cannot register API group "
-                   "%lx with major(%u) minor(%u)\n",
+                   "%lx with major(%lu) minor(%lu)\n",
                    group, major, minor);
        prom_halt();
 }

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 340c5b976d280ba9948dd5b4774759d4baf401be..d397d7fc5c2830e288ddc60abc0c6465368db28f 100644 (file)
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -37,7 +37,7 @@ void * __init prom_early_alloc(unsigned long size)
        void *ret;
 
        if (!paddr) {
-               prom_printf("prom_early_alloc(%lu) failed\n");
+               prom_printf("prom_early_alloc(%lu) failed\n", size);
                prom_halt();
        }
 

diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index 3b05e6697710da1718be093e1f56dccaddc04e94..fa1f1d375ffc263571ab3b75e4dd0477284d583b 100644 (file)
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -850,7 +850,7 @@ void __init cheetah_ecache_flush_init(void)
        ecache_flush_physbase = find_ecache_flush_span(ecache_flush_size);
 
        if (ecache_flush_physbase == ~0UL) {
-               prom_printf("cheetah_ecache_flush_init: Cannot find %d byte "
+               prom_printf("cheetah_ecache_flush_init: Cannot find %ld byte "
                            "contiguous physical memory.\n",
                            ecache_flush_size);
                prom_halt();

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 696bb095e0fca7395b02268f8e93229868d713b3..7a9b788c6ced6d3b1e8685ee2b22e829496c0224 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -119,7 +119,8 @@ static void __init read_obp_memory(const char *property,
 
        ret = prom_getproperty(node, property, (char *) regs, prop_size);
        if (ret == -1) {
-               prom_printf("Couldn't get %s property from /memory.\n");
+               prom_printf("Couldn't get %s property from /memory.\n",
+                               property);
                prom_halt();
        }
 
@@ -497,7 +498,7 @@ static void __init read_obp_translations(void)
                prom_halt();
        }
        if (unlikely(n > sizeof(prom_trans))) {
-               prom_printf("prom_mappings: Size %Zd is too big.\n", n);
+               prom_printf("prom_mappings: Size %d is too big.\n", n);
                prom_halt();
        }
 
@@ -559,7 +560,7 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr,
        unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu);
 
        if (ret != 0) {
-               prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: "
+               prom_printf("hypervisor_tlb_lock[%lx:%x:%lx:%lx]: "
                            "errors with %lx\n", vaddr, 0, pte, mmu, ret);
                prom_halt();
        }

diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index a8a58cad9d2b1eaab321e3bc87347fab0e5eb24c..0f4f7191fbbad93d6600ac409f6baae24c911d5e 100644 (file)
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -90,8 +90,8 @@ static void __init sbus_iommu_init(struct platform_device *op)
            it to us. */
         tmp = __get_free_pages(GFP_KERNEL, IOMMU_ORDER);
        if (!tmp) {
-               prom_printf("Unable to allocate iommu table [0x%08x]\n",
-                           IOMMU_NPTES*sizeof(iopte_t));
+               prom_printf("Unable to allocate iommu table [0x%lx]\n",
+                           IOMMU_NPTES * sizeof(iopte_t));
                prom_halt();
        }
        iommu->page_table = (iopte_t *)tmp;