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

coding style cleanups for drivers/md/mktables.c

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Oliver Pinter and committed by
Linus Torvalds
54212cf4 91c43132

+83 -79
+83 -79
drivers/md/mktables.c
··· 26 26 27 27 static uint8_t gfmul(uint8_t a, uint8_t b) 28 28 { 29 - uint8_t v = 0; 29 + uint8_t v = 0; 30 30 31 - while ( b ) { 32 - if ( b & 1 ) v ^= a; 33 - a = (a << 1) ^ (a & 0x80 ? 0x1d : 0); 34 - b >>= 1; 35 - } 36 - return v; 31 + while (b) { 32 + if (b & 1) 33 + v ^= a; 34 + a = (a << 1) ^ (a & 0x80 ? 0x1d : 0); 35 + b >>= 1; 36 + } 37 + 38 + return v; 37 39 } 38 40 39 41 static uint8_t gfpow(uint8_t a, int b) 40 42 { 41 - uint8_t v = 1; 43 + uint8_t v = 1; 42 44 43 - b %= 255; 44 - if ( b < 0 ) 45 - b += 255; 45 + b %= 255; 46 + if (b < 0) 47 + b += 255; 46 48 47 - while ( b ) { 48 - if ( b & 1 ) v = gfmul(v,a); 49 - a = gfmul(a,a); 50 - b >>= 1; 51 - } 52 - return v; 49 + while (b) { 50 + if (b & 1) 51 + v = gfmul(v, a); 52 + a = gfmul(a, a); 53 + b >>= 1; 54 + } 55 + 56 + return v; 53 57 } 54 58 55 59 int main(int argc, char *argv[]) 56 60 { 57 - int i, j, k; 58 - uint8_t v; 59 - uint8_t exptbl[256], invtbl[256]; 61 + int i, j, k; 62 + uint8_t v; 63 + uint8_t exptbl[256], invtbl[256]; 60 64 61 - printf("#include \"raid6.h\"\n"); 65 + printf("#include \"raid6.h\"\n"); 62 66 63 - /* Compute multiplication table */ 64 - printf("\nconst u8 __attribute__((aligned(256)))\n" 65 - "raid6_gfmul[256][256] =\n" 66 - "{\n"); 67 - for ( i = 0 ; i < 256 ; i++ ) { 68 - printf("\t{\n"); 69 - for ( j = 0 ; j < 256 ; j += 8 ) { 70 - printf("\t\t"); 71 - for ( k = 0 ; k < 8 ; k++ ) { 72 - printf("0x%02x, ", gfmul(i,j+k)); 73 - } 74 - printf("\n"); 75 - } 76 - printf("\t},\n"); 77 - } 78 - printf("};\n"); 67 + /* Compute multiplication table */ 68 + printf("\nconst u8 __attribute__((aligned(256)))\n" 69 + "raid6_gfmul[256][256] =\n" 70 + "{\n"); 71 + for (i = 0; i < 256; i++) { 72 + printf("\t{\n"); 73 + for (j = 0; j < 256; j += 8) { 74 + printf("\t\t"); 75 + for (k = 0; k < 8; k++) 76 + printf("0x%02x, ", gfmul(i, j+k)); 77 + printf("\n"); 78 + } 79 + printf("\t},\n"); 80 + } 81 + printf("};\n"); 79 82 80 - /* Compute power-of-2 table (exponent) */ 81 - v = 1; 82 - printf("\nconst u8 __attribute__((aligned(256)))\n" 83 - "raid6_gfexp[256] =\n" 84 - "{\n"); 85 - for ( i = 0 ; i < 256 ; i += 8 ) { 86 - printf("\t"); 87 - for ( j = 0 ; j < 8 ; j++ ) { 88 - exptbl[i+j] = v; 89 - printf("0x%02x, ", v); 90 - v = gfmul(v,2); 91 - if ( v == 1 ) v = 0; /* For entry 255, not a real entry */ 92 - } 93 - printf("\n"); 94 - } 95 - printf("};\n"); 83 + /* Compute power-of-2 table (exponent) */ 84 + v = 1; 85 + printf("\nconst u8 __attribute__((aligned(256)))\n" 86 + "raid6_gfexp[256] =\n" 87 + "{\n"); 88 + for (i = 0; i < 256; i += 8) { 89 + printf("\t"); 90 + for (j = 0; j < 8; j++) { 91 + exptbl[i+j] = v; 92 + printf("0x%02x, ", v); 93 + v = gfmul(v, 2); 94 + if (v == 1) 95 + v = 0; /* For entry 255, not a real entry */ 96 + } 97 + printf("\n"); 98 + } 99 + printf("};\n"); 96 100 97 - /* Compute inverse table x^-1 == x^254 */ 98 - printf("\nconst u8 __attribute__((aligned(256)))\n" 99 - "raid6_gfinv[256] =\n" 100 - "{\n"); 101 - for ( i = 0 ; i < 256 ; i += 8 ) { 102 - printf("\t"); 103 - for ( j = 0 ; j < 8 ; j++ ) { 104 - invtbl[i+j] = v = gfpow(i+j,254); 105 - printf("0x%02x, ", v); 106 - } 107 - printf("\n"); 108 - } 109 - printf("};\n"); 101 + /* Compute inverse table x^-1 == x^254 */ 102 + printf("\nconst u8 __attribute__((aligned(256)))\n" 103 + "raid6_gfinv[256] =\n" 104 + "{\n"); 105 + for (i = 0; i < 256; i += 8) { 106 + printf("\t"); 107 + for (j = 0; j < 8; j++) { 108 + v = gfpow(i+j, 254); 109 + invtbl[i+j] = v; 110 + printf("0x%02x, ", v); 111 + } 112 + printf("\n"); 113 + } 114 + printf("};\n"); 110 115 111 - /* Compute inv(2^x + 1) (exponent-xor-inverse) table */ 112 - printf("\nconst u8 __attribute__((aligned(256)))\n" 113 - "raid6_gfexi[256] =\n" 114 - "{\n"); 115 - for ( i = 0 ; i < 256 ; i += 8 ) { 116 - printf("\t"); 117 - for ( j = 0 ; j < 8 ; j++ ) { 118 - printf("0x%02x, ", invtbl[exptbl[i+j]^1]); 119 - } 120 - printf("\n"); 121 - } 122 - printf("};\n\n"); 116 + /* Compute inv(2^x + 1) (exponent-xor-inverse) table */ 117 + printf("\nconst u8 __attribute__((aligned(256)))\n" 118 + "raid6_gfexi[256] =\n" 119 + "{\n"); 120 + for (i = 0; i < 256; i += 8) { 121 + printf("\t"); 122 + for (j = 0; j < 8; j++) 123 + printf("0x%02x, ", invtbl[exptbl[i+j]^1]); 124 + printf("\n"); 125 + } 126 + printf("};\n\n"); 123 127 124 - return 0; 128 + return 0; 125 129 }