diff mbox

[U-Boot] bootcount: Correct #endif comment to match, other aesthetics

Message ID alpine.LFD.2.20.1512220712270.15998@localhost
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Robert P. J. Day Dec. 22, 2015, 12:15 p.m. UTC 
Correct mismatched comment on #endif to agree with its #if defined().

Also add some missing #endif comments for consistency, take out
extraneous blank lines for readability.

rday

---

Comments

Tom Rini Jan. 9, 2016, 3:34 a.m. UTC | #1 
On Tue, Dec 22, 2015 at 07:15:14AM -0500, Robert P. J. Day wrote:

> Correct mismatched comment on #endif to agree with its #if defined().
> 
> Also add some missing #endif comments for consistency, take out
> extraneous blank lines for readability.
> 
> rday
> 
> diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
> index e0343f7..d5ce450 100644

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index e0343f7..d5ce450 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -31,16 +31,14 @@ 

 #if defined(CONFIG_MPC8260)
 #include <asm/cpm_8260.h>
-
 #define CONFIG_SYS_BOOTCOUNT_ADDR	(CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR)
 #endif /* defined(CONFIG_MPC8260) */

 #if defined(CONFIG_QE)
 #include <linux/immap_qe.h>
-
 #define CONFIG_SYS_BOOTCOUNT_ADDR	(CONFIG_SYS_IMMR + 0x110000 + \
 					 QE_MURAM_SIZE - 2 * sizeof(u32))
-#endif /* defined(CONFIG_MPC8360) */
+#endif /* defined(CONFIG_QE) */

 #if defined(CONFIG_4xx)
 #define CONFIG_SYS_BOOTCOUNT_ADDR	(CONFIG_SYS_OCM_DATA_ADDR + \
@@ -60,7 +58,7 @@  __weak void bootcount_store(ulong a)
 #else
 	raw_bootcount_store(reg, a);
 	raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC);
-#endif
+#endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD */
 }

 __weak ulong bootcount_load(void)
@@ -79,6 +77,6 @@  __weak ulong bootcount_load(void)
 		return 0;
 	else
 		return raw_bootcount_load(reg);
-#endif
+#endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
 }
-#endif
+#endif /* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */