OMAP3: id: add fallthrough warning; fix some CodingStyle issues

Emit a warning to the console in omap3_check_revision() if that code
cannot determine what type of SoC the system is currently running on.

Remove some extra whitespace, remove some duplicate code, and
add an appropriate comment to a fallthrough case.

Signed-off-by: Paul Walmsley <[email protected]>
Cc: Hemant Pedanekar <[email protected]>
Tested-by: Igor Grinberg <[email protected]>
Tested-by: Abhilash Koyamangalath <[email protected]>

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 94a51cfc64836318b3adcacee33703daf8321e0c..3f4a0d0395e27abd814efc0362807bc87e1c7630 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -336,8 +336,9 @@ static void __init omap3_check_revision(void)
                        omap_chip.oc |= CHIP_IS_OMAP3630ES1_1;
                        break;
                case 2:
+               /* FALLTHROUGH */
                default:
-                       omap_revision =  OMAP3630_REV_ES1_2;
+                       omap_revision = OMAP3630_REV_ES1_2;
                        omap_chip.oc |= CHIP_IS_OMAP3630ES1_2;
                }
                break;
@@ -349,16 +350,16 @@ static void __init omap3_check_revision(void)
                        omap_revision = TI8168_REV_ES1_0;
                        break;
                case 1:
-                       omap_revision = TI8168_REV_ES1_1;
-                       break;
+               /* FALLTHROUGH */
                default:
-                       omap_revision =  TI8168_REV_ES1_1;
+                       omap_revision = TI8168_REV_ES1_1;
                }
                break;
        default:
-               /* Unknown default to latest silicon rev as default*/
+               /* Unknown default to latest silicon rev as default */
                omap_revision =  OMAP3630_REV_ES1_2;
                omap_chip.oc |= CHIP_IS_OMAP3630ES1_2;
+               pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n");
        }
 }