powerpc/time: Make get_tb() common to PPC32 and PPC64

chleroy · mpe · commit 9686e431c683 · 2020-10-08T21:17:16.000+11:00
mftbu() is always defined now, so the #ifdef can be removed and replaced by an IS_ENABLED(CONFIG_PPC64) inside the PPC32 version of get_tb(). Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/47e49717d2643169ffcbe5d507f184cf49f0fe95.1601556145.git.christophe.leroy@csgroup.eu
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
@@ -53,16 +53,13 @@ static inline u64 get_vtb(void)
 	return 0;
 }
 
-#ifdef CONFIG_PPC64
-static inline u64 get_tb(void)
-{
-	return mftb();
-}
-#else /* CONFIG_PPC64 */
 static inline u64 get_tb(void)
 {
 	unsigned int tbhi, tblo, tbhi2;
 
+	if (IS_ENABLED(CONFIG_PPC64))
+		return mftb();
+
 	do {
 		tbhi = mftbu();
 		tblo = mftb();
@@ -71,7 +68,6 @@ static inline u64 get_tb(void)
 
 	return ((u64)tbhi << 32) | tblo;
 }
-#endif /* !CONFIG_PPC64 */
 
 static inline void set_tb(unsigned int upper, unsigned int lower)
 {

Original file line number	Diff line number	Diff line change
`@@ -53,16 +53,13 @@ static inline u64 get_vtb(void)`
`53`	`53`	`return 0;`
`54`	`54`	`}`
`55`	`55`
`56`		`-#ifdef CONFIG_PPC64`
`57`		`-static inline u64 get_tb(void)`
`58`		`-{`
`59`		`- return mftb();`
`60`		`-}`
`61`		`-#else /* CONFIG_PPC64 */`
`62`	`56`	`static inline u64 get_tb(void)`
`63`	`57`	`{`
`64`	`58`	`unsigned int tbhi, tblo, tbhi2;`
`65`	`59`
	`60`	`+ if (IS_ENABLED(CONFIG_PPC64))`
	`61`	`+ return mftb();`
	`62`	`+`
`66`	`63`	`do {`
`67`	`64`	`tbhi = mftbu();`
`68`	`65`	`tblo = mftb();`
`@@ -71,7 +68,6 @@ static inline u64 get_tb(void)`
`71`	`68`
`72`	`69`	`return ((u64)tbhi << 32) \| tblo;`
`73`	`70`	`}`
`74`		`-#endif /* !CONFIG_PPC64 */`
`75`	`71`
`76`	`72`	`static inline void set_tb(unsigned int upper, unsigned int lower)`
`77`	`73`	`{`