[ifxmips] many more code cleanups for checkpatch.pl, most flagged as errors

[openwrt/svn-archive/archive.git] / target / linux / ifxmips / files / arch / mips / ifxmips / prom.c

diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
index ef8750b6fe87480d196e15c5a5a5945ff22983e8..a0fc68ebd6ae3284c7d395539fbc9af7900eb675 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
@@ -26,11 +26,11 @@
 static char buf[1024]; /* for prom_printf() */
 
 /* for voice cpu (MIPS24K) */
-unsigned int *prom_cp1_base = NULL;
-unsigned int prom_cp1_size = 0;
+unsigned int *prom_cp1_base;
+unsigned int prom_cp1_size;
 
 /* for Multithreading (APRP) on MIPS34K */
-unsigned long physical_memsize = 0L;
+unsigned long physical_memsize;
 
 #ifdef IFXMIPS_PROM_ASC0
 #define IFXMIPS_ASC_DIFF       0
@@ -57,7 +57,8 @@ void prom_putchar(char c)
        unsigned long flags;
 
        local_irq_save(flags);
-       while((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
+       while ((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF)
+               ;
 
        if (c == '\n')
                asc_w32('\r', IFXMIPS_ASC_TBUF);
@@ -105,10 +106,9 @@ void __init prom_init(void)
        mips_machtype = MACH_INFINEON_IFXMIPS;
 
        if (argc) {
-               argv = (char**)KSEG1ADDR((unsigned long)argv);
+               argv = (char **)KSEG1ADDR((unsigned long)argv);
                arcs_cmdline[0] = '\0';
-               for (i = 1; i < argc; i++)
-               {
+               for (i = 1; i < argc; i++) {
                        char *a = (char *)KSEG1ADDR(argv[i]);
                        if (!argv[i])
                                continue;
@@ -129,25 +129,22 @@ void __init prom_init(void)
                        strcpy(&(arcs_cmdline[0]),
                                "console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit");
        }
-       envp = (char**)KSEG1ADDR((unsigned long)envp);
-       while(*envp)
-       {
+       envp = (char **)KSEG1ADDR((unsigned long)envp);
+       while (*envp) {
                char *e = (char *)KSEG1ADDR(*envp);
 
-               if (!strncmp(e, "memsize=", 8))
-               {
+               if (!strncmp(e, "memsize=", 8)) {
                        e += 8;
                        memsize = simple_strtoul(e, NULL, 10);
                }
                envp++;
        }
-
        memsize *= 1024 * 1024;
 
        /* only on Twinpass/Danube a second CPU is used for Voice */
        if ((cpu_data[0].cputype == CPU_24K) && (prom_cp1_size)) {
                memsize -= prom_cp1_size;
-               prom_cp1_base = (unsigned int*)KSEG1ADDR(memsize);
+               prom_cp1_base = (unsigned int *)KSEG1ADDR(memsize);
 
                prom_printf("Using %dMB Ram and reserving %dMB for cp1\n",
                        memsize>>20, prom_cp1_size>>20);