From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932218Ab1D0NUe (ORCPT ); Wed, 27 Apr 2011 09:20:34 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:54113 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932179Ab1D0NU2 (ORCPT ); Wed, 27 Apr 2011 09:20:28 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=nRQ+F4qEHFRpshXXkN8Lo04mdoSlTW2JnyLiL6iOjxpEztu/Opj3/m5kQ3UqjskgSj krHBkbfnGU+q+VCunIetZEvTr639LfZi0vFXzvRX0rty4PH+8WputAlIEJ+R64WSAhMK xUAGkAIfZ5AGZ1B34c9fu+NL+j2IGHBYCHDVs= From: Akinobu Mita To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org, arnd@arndb.de Cc: Akinobu Mita , Martin Schwidefsky , Heiko Carstens , Greg Ungerer Subject: [PATCH v3 5/7] arm: use asm-generic/bitops/le.h Date: Wed, 27 Apr 2011 22:20:09 +0900 Message-Id: <1303910411-15793-6-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1303910411-15793-1-git-send-email-akinobu.mita@gmail.com> References: <1303910411-15793-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The previous style change enables to use asm-generic/bitops/le.h on arm. Signed-off-by: Akinobu Mita Acked-by: Russell King Cc: Arnd Bergmann Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Greg Ungerer --- Changes from previous submission: - Add Acked-by: line - No change in the patch itself arch/arm/include/asm/bitops.h | 43 ++++------------------------------------ 1 files changed, 5 insertions(+), 38 deletions(-) diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 18a024b..b4892a0 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -203,8 +203,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); #define find_first_bit(p,sz) _find_first_bit_le(p,sz) #define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off) -#define WORD_BITOFF_TO_LE(x) ((x)) - #else /* * These are the big endian, atomic definitions. @@ -214,8 +212,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); #define find_first_bit(p,sz) _find_first_bit_be(p,sz) #define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off) -#define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18) - #endif #if __LINUX_ARM_ARCH__ < 5 @@ -287,40 +283,7 @@ static inline int fls(int x) #include #include -static inline void __set_bit_le(int nr, void *addr) -{ - __set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline void __clear_bit_le(int nr, void *addr) -{ - __clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int __test_and_set_bit_le(int nr, void *addr) -{ - return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_and_set_bit_le(int nr, void *addr) -{ - return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int __test_and_clear_bit_le(int nr, void *addr) -{ - return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_and_clear_bit_le(int nr, void *addr) -{ - return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr); -} - -static inline int test_bit_le(int nr, const void *addr) -{ - return test_bit(WORD_BITOFF_TO_LE(nr), addr); -} +#ifdef __ARMEB__ static inline int find_first_zero_bit_le(const void *p, unsigned size) { @@ -340,6 +303,10 @@ static inline int find_next_bit_le(const void *p, int size, int offset) } #define find_next_bit_le find_next_bit_le +#endif + +#include + /* * Ext2 is defined to use little-endian byte ordering. */ -- 1.7.4.4