diff options
author | Paul Walmsley <paul@pwsan.com> | 2011-09-13 21:52:15 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-09-14 17:44:44 -0400 |
commit | 51ec811a292eba77c1df00d9d6416526b1ce7972 (patch) | |
tree | 6af57ed235c7732511ba8c7f5200b54db2c28e65 /arch | |
parent | 9ed2ba7aa78ee35dda2cfc9a49b5cd4b2ae88500 (diff) |
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 <paul@pwsan.com>
Cc: Hemant Pedanekar <hemantp@ti.com>
Tested-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Abhilash Koyamangalath <abhilash.kv@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/id.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 94a51cfc6483..3f4a0d0395e2 100644 --- 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) | |||
336 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; | 336 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; |
337 | break; | 337 | break; |
338 | case 2: | 338 | case 2: |
339 | /* FALLTHROUGH */ | ||
339 | default: | 340 | default: |
340 | omap_revision = OMAP3630_REV_ES1_2; | 341 | omap_revision = OMAP3630_REV_ES1_2; |
341 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; | 342 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; |
342 | } | 343 | } |
343 | break; | 344 | break; |
@@ -349,16 +350,16 @@ static void __init omap3_check_revision(void) | |||
349 | omap_revision = TI8168_REV_ES1_0; | 350 | omap_revision = TI8168_REV_ES1_0; |
350 | break; | 351 | break; |
351 | case 1: | 352 | case 1: |
352 | omap_revision = TI8168_REV_ES1_1; | 353 | /* FALLTHROUGH */ |
353 | break; | ||
354 | default: | 354 | default: |
355 | omap_revision = TI8168_REV_ES1_1; | 355 | omap_revision = TI8168_REV_ES1_1; |
356 | } | 356 | } |
357 | break; | 357 | break; |
358 | default: | 358 | default: |
359 | /* Unknown default to latest silicon rev as default*/ | 359 | /* Unknown default to latest silicon rev as default */ |
360 | omap_revision = OMAP3630_REV_ES1_2; | 360 | omap_revision = OMAP3630_REV_ES1_2; |
361 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; | 361 | omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; |
362 | pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n"); | ||
362 | } | 363 | } |
363 | } | 364 | } |
364 | 365 | ||