tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

rtlwifi: Remove last definitions of local bit manipulation macros

All usage of the local macros have been removed, thus the remaining
definitions are deleted.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Larry Finger and committed by
Kalle Valo bb7e6d85 84bc9a58

-115
-115
drivers/net/wireless/realtek/rtlwifi/wifi.h
··· 2898 2898 * 2. Before write integer to IO. 2899 2899 * 3. After read integer from IO. 2900 2900 ****************************************/ 2901 - /* Convert little data endian to host ordering */ 2902 - #define EF1BYTE(_val) \ 2903 - ((u8)(_val)) 2904 - #define EF2BYTE(_val) \ 2905 - (le16_to_cpu(_val)) 2906 - #define EF4BYTE(_val) \ 2907 - (le32_to_cpu(_val)) 2908 - 2909 - /* Read data from memory */ 2910 - #define READEF1BYTE(_ptr) \ 2911 - EF1BYTE(*((u8 *)(_ptr))) 2912 - /* Read le16 data from memory and convert to host ordering */ 2913 - #define READEF2BYTE(_ptr) \ 2914 - EF2BYTE(*(_ptr)) 2915 - #define READEF4BYTE(_ptr) \ 2916 - EF4BYTE(*(_ptr)) 2917 - 2918 - /* Create a bit mask 2919 - * Examples: 2920 - * BIT_LEN_MASK_32(0) => 0x00000000 2921 - * BIT_LEN_MASK_32(1) => 0x00000001 2922 - * BIT_LEN_MASK_32(2) => 0x00000003 2923 - * BIT_LEN_MASK_32(32) => 0xFFFFFFFF 2924 - */ 2925 - #define BIT_LEN_MASK_32(__bitlen) \ 2926 - (0xFFFFFFFF >> (32 - (__bitlen))) 2927 - #define BIT_LEN_MASK_16(__bitlen) \ 2928 - (0xFFFF >> (16 - (__bitlen))) 2929 - #define BIT_LEN_MASK_8(__bitlen) \ 2930 - (0xFF >> (8 - (__bitlen))) 2931 - 2932 - /* Create an offset bit mask 2933 - * Examples: 2934 - * BIT_OFFSET_LEN_MASK_32(0, 2) => 0x00000003 2935 - * BIT_OFFSET_LEN_MASK_32(16, 2) => 0x00030000 2936 - */ 2937 - #define BIT_OFFSET_LEN_MASK_32(__bitoffset, __bitlen) \ 2938 - (BIT_LEN_MASK_32(__bitlen) << (__bitoffset)) 2939 - #define BIT_OFFSET_LEN_MASK_16(__bitoffset, __bitlen) \ 2940 - (BIT_LEN_MASK_16(__bitlen) << (__bitoffset)) 2941 - #define BIT_OFFSET_LEN_MASK_8(__bitoffset, __bitlen) \ 2942 - (BIT_LEN_MASK_8(__bitlen) << (__bitoffset)) 2943 - 2944 - /*Description: 2945 - * Return 4-byte value in host byte ordering from 2946 - * 4-byte pointer in little-endian system. 2947 - */ 2948 - #define LE_P4BYTE_TO_HOST_4BYTE(__pstart) \ 2949 - (EF4BYTE(*((__le32 *)(__pstart)))) 2950 - #define LE_P2BYTE_TO_HOST_2BYTE(__pstart) \ 2951 - (EF2BYTE(*((__le16 *)(__pstart)))) 2952 - #define LE_P1BYTE_TO_HOST_1BYTE(__pstart) \ 2953 - (EF1BYTE(*((u8 *)(__pstart)))) 2954 - 2955 - /*Description: 2956 - * Translate subfield (continuous bits in little-endian) of 4-byte 2957 - * value to host byte ordering. 2958 - */ 2959 - #define LE_BITS_TO_4BYTE(__pstart, __bitoffset, __bitlen) \ 2960 - ( \ 2961 - (LE_P4BYTE_TO_HOST_4BYTE(__pstart) >> (__bitoffset)) & \ 2962 - BIT_LEN_MASK_32(__bitlen) \ 2963 - ) 2964 - #define LE_BITS_TO_2BYTE(__pstart, __bitoffset, __bitlen) \ 2965 - ( \ 2966 - (LE_P2BYTE_TO_HOST_2BYTE(__pstart) >> (__bitoffset)) & \ 2967 - BIT_LEN_MASK_16(__bitlen) \ 2968 - ) 2969 - #define LE_BITS_TO_1BYTE(__pstart, __bitoffset, __bitlen) \ 2970 - ( \ 2971 - (LE_P1BYTE_TO_HOST_1BYTE(__pstart) >> (__bitoffset)) & \ 2972 - BIT_LEN_MASK_8(__bitlen) \ 2973 - ) 2974 - 2975 - /* Description: 2976 - * Mask subfield (continuous bits in little-endian) of 4-byte value 2977 - * and return the result in 4-byte value in host byte ordering. 2978 - */ 2979 - #define LE_BITS_CLEARED_TO_4BYTE(__pstart, __bitoffset, __bitlen) \ 2980 - ( \ 2981 - LE_P4BYTE_TO_HOST_4BYTE(__pstart) & \ 2982 - (~BIT_OFFSET_LEN_MASK_32(__bitoffset, __bitlen)) \ 2983 - ) 2984 - #define LE_BITS_CLEARED_TO_2BYTE(__pstart, __bitoffset, __bitlen) \ 2985 - ( \ 2986 - LE_P2BYTE_TO_HOST_2BYTE(__pstart) & \ 2987 - (~BIT_OFFSET_LEN_MASK_16(__bitoffset, __bitlen)) \ 2988 - ) 2989 - #define LE_BITS_CLEARED_TO_1BYTE(__pstart, __bitoffset, __bitlen) \ 2990 - ( \ 2991 - LE_P1BYTE_TO_HOST_1BYTE(__pstart) & \ 2992 - (~BIT_OFFSET_LEN_MASK_8(__bitoffset, __bitlen)) \ 2993 - ) 2994 - 2995 - /* Description: 2996 - * Set subfield of little-endian 4-byte value to specified value. 2997 - */ 2998 - #define SET_BITS_TO_LE_4BYTE(__pstart, __bitoffset, __bitlen, __val) \ 2999 - *((__le32 *)(__pstart)) = \ 3000 - cpu_to_le32( \ 3001 - LE_BITS_CLEARED_TO_4BYTE(__pstart, __bitoffset, __bitlen) | \ 3002 - ((((u32)__val) & BIT_LEN_MASK_32(__bitlen)) << (__bitoffset)) \ 3003 - ) 3004 - #define SET_BITS_TO_LE_2BYTE(__pstart, __bitoffset, __bitlen, __val) \ 3005 - *((__le16 *)(__pstart)) = \ 3006 - cpu_to_le16( \ 3007 - LE_BITS_CLEARED_TO_2BYTE(__pstart, __bitoffset, __bitlen) | \ 3008 - ((((u16)__val) & BIT_LEN_MASK_16(__bitlen)) << (__bitoffset)) \ 3009 - ) 3010 - #define SET_BITS_TO_LE_1BYTE(__pstart, __bitoffset, __bitlen, __val) \ 3011 - *((u8 *)(__pstart)) = EF1BYTE \ 3012 - ( \ 3013 - LE_BITS_CLEARED_TO_1BYTE(__pstart, __bitoffset, __bitlen) | \ 3014 - ((((u8)__val) & BIT_LEN_MASK_8(__bitlen)) << (__bitoffset)) \ 3015 - ) 3016 2901 3017 2902 #define N_BYTE_ALIGMENT(__value, __aligment) ((__aligment == 1) ? \ 3018 2903 (__value) : (((__value + __aligment - 1) / __aligment) * __aligment))