parisc: Fix inconsistent indenting in setup_cmdline()
authorHelge Deller <deller@gmx.de>
Wed, 16 Nov 2022 20:46:03 +0000 (21:46 +0100)
committerHelge Deller <deller@gmx.de>
Sat, 17 Dec 2022 12:25:34 +0000 (13:25 +0100)
Fix warning reported by 0-DAY CI Kernel Test Service:
arch/parisc/kernel/setup.c:64 setup_cmdline() warn: inconsistent indenting

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Helge Deller <deller@gmx.de>
arch/parisc/kernel/setup.c

index 375f38d..0797db6 100644 (file)
@@ -50,15 +50,15 @@ void __init setup_cmdline(char **cmdline_p)
        extern unsigned int boot_args[];
        char *p;
 
-       /* Collect stuff passed in from the boot loader */
+       *cmdline_p = command_line;
 
        /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
-       if (boot_args[0] < 64) {
-               /* called from hpux boot loader */
-               boot_command_line[0] = '\0';
-       } else {
-               strscpy(boot_command_line, (char *)__va(boot_args[1]),
-                       COMMAND_LINE_SIZE);
+       if (boot_args[0] < 64)
+               return; /* return if called from hpux boot loader */
+
+       /* Collect stuff passed in from the boot loader */
+       strscpy(boot_command_line, (char *)__va(boot_args[1]),
+               COMMAND_LINE_SIZE);
 
        /* autodetect console type (if not done by palo yet) */
        p = boot_command_line;
@@ -75,16 +75,14 @@ void __init setup_cmdline(char **cmdline_p)
                strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE);
 
 #ifdef CONFIG_BLK_DEV_INITRD
-               if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
-               {
-                   initrd_start = (unsigned long)__va(boot_args[2]);
-                   initrd_end = (unsigned long)__va(boot_args[3]);
-               }
-#endif
+       /* did palo pass us a ramdisk? */
+       if (boot_args[2] != 0) {
+               initrd_start = (unsigned long)__va(boot_args[2]);
+               initrd_end = (unsigned long)__va(boot_args[3]);
        }
+#endif
 
        strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
-       *cmdline_p = command_line;
 }
 
 #ifdef CONFIG_PA11