From patchwork Fri Nov 6 09:25:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Rossi X-Patchwork-Id: 540935 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 544901406AA for ; Fri, 6 Nov 2015 23:18:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi_com.20150623.gappssmtp.com header.i=@nathanrossi_com.20150623.gappssmtp.com header.b=FFb8156k; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0C8B0A7569; Fri, 6 Nov 2015 13:18:02 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TbEB2Gz0LVlC; Fri, 6 Nov 2015 13:18:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 384C24BE75; Fri, 6 Nov 2015 13:17:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D7F304BB66 for ; Fri, 6 Nov 2015 10:25:33 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TuQBZ01Zd29W for ; Fri, 6 Nov 2015 10:25:33 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by theia.denx.de (Postfix) with ESMTPS id 3B4BF4BB63 for ; Fri, 6 Nov 2015 10:25:29 +0100 (CET) Received: by pabfh17 with SMTP id fh17so117558002pab.0 for ; Fri, 06 Nov 2015 01:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QWURy4PIW7OMK5JfGXY3XqRwW3h4PVQa1ppVIsbzO7w=; b=FFb8156kL+8ObYbr7CaXpc65U4jimDyxMhhV96kr/6CDUi+8Xrdj8bUg1y2BApacdR 4+E7ul/Xn5CnR+6gpwLp+y7elJJFHkF8KtWFHUvP6Fn7ZQF0VhjNhg58jExzzrRGZNNW Vmb2kDNV7N9XRB2uki+DZiuX7UjOKTCLwYVJLLMZW2M6bNLWrMMzJTVpeZGsrfpufp9p H8gmrFgYtzycgQPihwvn0Iv6lURIB9++LZlwlRsX2j+ZjcAH6eulOYbLROqHcDMBAKKg PKwCqBts7iSZ6LQfsAe4Vurj+kalPkQvAinHAM9H8U6rthPTUQKxjRFbVUY6qtqXmzKA gh/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QWURy4PIW7OMK5JfGXY3XqRwW3h4PVQa1ppVIsbzO7w=; b=be+Ks4m1mqHNa2361AQnEK+G1rSRjLrkP6QKt6p+VLFEgRcH1s7bDS/69GUe8qadQf RkQcEMuua+zihJfdhEnTXS4u0QSxdhS5QuIpM2GDtnGcBEYHfrBTzMkFLZ/ACdRlNDpG BvMJuRbM1Z8eqhrZamzYJ7XO1vFarxIcsIBd1lFQCh5hrPXAttG5NXI7i1RfGZ8Sq9Gt L+a/7BkpyQLU6kxQnbwgn1kLPjhFZJob82ZJjG+ip1M8oLH6u4SChoJC5kpkgRxE0dxA tH5Pz7x9e3+zLYxAqczvEc0OcTznUj4MDmaxDoWpYNExETHC95TTp0mjnKWpCEr4qohT +ylA== X-Gm-Message-State: ALoCoQkwA1l1snhBZvlNEk7TB0RoWE779cppAEt0VIy4pd1FEn7bJiqPj2BoOadKNTBfHb0PAdZE X-Received: by 10.66.162.100 with SMTP id xz4mr16126531pab.145.1446801928364; Fri, 06 Nov 2015 01:25:28 -0800 (PST) Received: from nathanbox.home.gateway ([43.252.110.152]) by smtp.gmail.com with ESMTPSA id d7sm12792342pas.31.2015.11.06.01.25.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 01:25:26 -0800 (PST) From: Nathan Rossi To: u-boot@lists.denx.de Date: Fri, 6 Nov 2015 19:25:05 +1000 Message-Id: <1446801906-9018-2-git-send-email-nathan@nathanrossi.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1446801906-9018-1-git-send-email-nathan@nathanrossi.com> References: <1446801906-9018-1-git-send-email-nathan@nathanrossi.com> X-Mailman-Approved-At: Fri, 06 Nov 2015 13:17:26 +0100 Cc: Tom Rini , Nathan Rossi Subject: [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix various style issues in MicroBlaze header files. Specifically fixing style voilations including '__inline__', 'foo * bar' and 'void foo ('. Signed-off-by: Nathan Rossi Cc: Michal Simek Cc: Tom Rini --- arch/microblaze/include/asm/bitops.h | 66 ++++++++++++++++++------------------ arch/microblaze/include/asm/system.h | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h index 0ac78d7..d42ee61 100644 --- a/arch/microblaze/include/asm/bitops.h +++ b/arch/microblaze/include/asm/bitops.h @@ -17,31 +17,31 @@ * The __ functions are not atomic */ -extern void set_bit(int nr, volatile void * addr); -extern void __set_bit(int nr, volatile void * addr); +extern void set_bit(int nr, volatile void *addr); +extern void __set_bit(int nr, volatile void *addr); -extern void clear_bit(int nr, volatile void * addr); +extern void clear_bit(int nr, volatile void *addr); #define __clear_bit(nr, addr) clear_bit(nr, addr) #define PLATFORM__CLEAR_BIT -extern void change_bit(int nr, volatile void * addr); -extern void __change_bit(int nr, volatile void * addr); -extern int test_and_set_bit(int nr, volatile void * addr); -extern int __test_and_set_bit(int nr, volatile void * addr); -extern int test_and_clear_bit(int nr, volatile void * addr); -extern int __test_and_clear_bit(int nr, volatile void * addr); -extern int test_and_change_bit(int nr, volatile void * addr); -extern int __test_and_change_bit(int nr, volatile void * addr); -extern int __constant_test_bit(int nr, const volatile void * addr); -extern int __test_bit(int nr, volatile void * addr); -extern int find_first_zero_bit(void * addr, unsigned size); -extern int find_next_zero_bit (void * addr, int size, int offset); +extern void change_bit(int nr, volatile void *addr); +extern void __change_bit(int nr, volatile void *addr); +extern int test_and_set_bit(int nr, volatile void *addr); +extern int __test_and_set_bit(int nr, volatile void *addr); +extern int test_and_clear_bit(int nr, volatile void *addr); +extern int __test_and_clear_bit(int nr, volatile void *addr); +extern int test_and_change_bit(int nr, volatile void *addr); +extern int __test_and_change_bit(int nr, volatile void *addr); +extern int __constant_test_bit(int nr, const volatile void *addr); +extern int __test_bit(int nr, volatile void *addr); +extern int find_first_zero_bit(void *addr, unsigned size); +extern int find_next_zero_bit(void *addr, int size, int offset); /* * ffz = Find First Zero in word. Undefined if no zero exists, * so code should check against ~0UL first.. */ -extern __inline__ unsigned long ffz(unsigned long word) +extern inline unsigned long ffz(unsigned long word) { unsigned long result = 0; @@ -53,7 +53,7 @@ extern __inline__ unsigned long ffz(unsigned long word) } -extern __inline__ void set_bit(int nr, volatile void * addr) +extern inline void set_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -66,7 +66,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr) restore_flags(flags); } -extern __inline__ void __set_bit(int nr, volatile void * addr) +extern inline void __set_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -83,7 +83,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr) #define smp_mb__before_clear_bit() barrier() #define smp_mb__after_clear_bit() barrier() -extern __inline__ void clear_bit(int nr, volatile void * addr) +extern inline void clear_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -96,7 +96,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr) restore_flags(flags); } -extern __inline__ void change_bit(int nr, volatile void * addr) +extern inline void change_bit(int nr, volatile void *addr) { int mask; unsigned long flags; @@ -109,7 +109,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr) restore_flags(flags); } -extern __inline__ void __change_bit(int nr, volatile void * addr) +extern inline void __change_bit(int nr, volatile void *addr) { int mask; unsigned long *ADDR = (unsigned long *) addr; @@ -119,7 +119,7 @@ extern __inline__ void __change_bit(int nr, volatile void * addr) *ADDR ^= mask; } -extern __inline__ int test_and_set_bit(int nr, volatile void * addr) +extern inline int test_and_set_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -135,7 +135,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int __test_and_set_bit(int nr, volatile void * addr) +extern inline int __test_and_set_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -147,7 +147,7 @@ extern __inline__ int __test_and_set_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int test_and_clear_bit(int nr, volatile void * addr) +extern inline int test_and_clear_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -163,7 +163,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr) +extern inline int __test_and_clear_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -175,7 +175,7 @@ extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int test_and_change_bit(int nr, volatile void * addr) +extern inline int test_and_change_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -191,7 +191,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int __test_and_change_bit(int nr, volatile void * addr) +extern inline int __test_and_change_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -206,12 +206,12 @@ extern __inline__ int __test_and_change_bit(int nr, volatile void * addr) /* * This routine doesn't need to be atomic. */ -extern __inline__ int __constant_test_bit(int nr, const volatile void * addr) +extern inline int __constant_test_bit(int nr, const volatile void *addr) { return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0; } -extern __inline__ int __test_bit(int nr, volatile void * addr) +extern inline int __test_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -229,7 +229,7 @@ extern __inline__ int __test_bit(int nr, volatile void * addr) #define find_first_zero_bit(addr, size) \ find_next_zero_bit((addr), (size), 0) -extern __inline__ int find_next_zero_bit (void * addr, int size, int offset) +extern inline int find_next_zero_bit(void *addr, int size, int offset) { unsigned long *p = ((unsigned long *) addr) + (offset >> 5); unsigned long result = offset & ~31UL; @@ -275,7 +275,7 @@ found_middle: #define hweight8(x) generic_hweight8(x) -extern __inline__ int ext2_set_bit(int nr, volatile void * addr) +extern inline int ext2_set_bit(int nr, volatile void *addr) { int mask, retval; unsigned long flags; @@ -290,7 +290,7 @@ extern __inline__ int ext2_set_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int ext2_clear_bit(int nr, volatile void * addr) +extern inline int ext2_clear_bit(int nr, volatile void *addr) { int mask, retval; unsigned long flags; @@ -305,7 +305,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr) return retval; } -extern __inline__ int ext2_test_bit(int nr, const volatile void * addr) +extern inline int ext2_test_bit(int nr, const volatile void *addr) { int mask; const volatile unsigned char *ADDR = (const unsigned char *) addr; diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index 0297a11..3090835 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last, ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr)))) #define tas(ptr) (xchg ((ptr), 1)) -extern inline unsigned long __xchg (unsigned long with, +extern inline unsigned long __xchg(unsigned long with, __volatile__ void *ptr, int size) { unsigned long tmp, flags;