From b5ba95a6c0a7043f4bc9e68e9da7063a2aedfbc5 Mon Sep 17 00:00:00 2001 From: TGY Date: Wed, 16 Aug 2023 00:48:40 +0200 Subject: [PATCH] Modernize obsolete inline order --- common.h | 2 +- common_alpha.h | 2 +- common_arm.h | 2 +- common_arm64.h | 2 +- common_power.h | 2 +- common_sparc.h | 2 +- common_x86.h | 2 +- common_x86_64.h | 2 +- common_zarch.h | 2 +- kernel/power/lock.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common.h b/common.h index 4eeeb8d55..4074df069 100644 --- a/common.h +++ b/common.h @@ -525,7 +525,7 @@ static inline unsigned long long rpcc(void){ #endif // !RPCC_DEFINED #if !defined(BLAS_LOCK_DEFINED) && defined(__GNUC__) -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ do { while (*address) {YIELDING;}; diff --git a/common_alpha.h b/common_alpha.h index 021eb93ae..e5380454a 100644 --- a/common_alpha.h +++ b/common_alpha.h @@ -45,7 +45,7 @@ #define WMB asm("wmb") #define RMB asm("mb") -static void __inline blas_lock(unsigned long *address){ +static __inline void blas_lock(unsigned long *address){ #ifndef __DECC unsigned long tmp1, tmp2; asm volatile( diff --git a/common_arm.h b/common_arm.h index 682315de5..a3db9953c 100644 --- a/common_arm.h +++ b/common_arm.h @@ -55,7 +55,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if defined(ARMV6) || defined(ARMV7) || defined(ARMV8) -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ int register ret; diff --git a/common_arm64.h b/common_arm64.h index 6a18a294c..436ccb8f5 100644 --- a/common_arm64.h +++ b/common_arm64.h @@ -55,7 +55,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSEMBLER -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ BLASULONG ret; diff --git a/common_power.h b/common_power.h index a49197fd7..3fe776f23 100644 --- a/common_power.h +++ b/common_power.h @@ -91,7 +91,7 @@ void *qalloc(int flags, size_t bytes); -static void INLINE blas_lock(volatile unsigned long *address){ +static INLINE void blas_lock(volatile unsigned long *address){ long int ret, val = 1; diff --git a/common_sparc.h b/common_sparc.h index 90a24ebf1..4b9e7840a 100644 --- a/common_sparc.h +++ b/common_sparc.h @@ -45,7 +45,7 @@ #ifndef ASSEMBLER -static void __inline blas_lock(volatile unsigned long *address){ +static __inline void blas_lock(volatile unsigned long *address){ long int ret = 1; diff --git a/common_x86.h b/common_x86.h index bc77eca58..65fb9a460 100644 --- a/common_x86.h +++ b/common_x86.h @@ -54,7 +54,7 @@ #define __volatile__ #endif -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ int ret; diff --git a/common_x86_64.h b/common_x86_64.h index 729a055ce..dda168d6c 100644 --- a/common_x86_64.h +++ b/common_x86_64.h @@ -70,7 +70,7 @@ #define RMB #endif -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ #ifndef C_MSVC diff --git a/common_zarch.h b/common_zarch.h index 442bae821..80609251b 100644 --- a/common_zarch.h +++ b/common_zarch.h @@ -45,7 +45,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSEMBLER /* -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ BLASULONG ret; diff --git a/kernel/power/lock.c b/kernel/power/lock.c index 1c1b006b0..de28680d8 100644 --- a/kernel/power/lock.c +++ b/kernel/power/lock.c @@ -36,7 +36,7 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -static void __inline blas_lock(volatile BLASULONG *address){ +static __inline void blas_lock(volatile BLASULONG *address){ #ifdef __GNUC__