Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a1f4c9222d5e71f9c2646f47beb4a0a42b42fdc4

Authored by Richard Hartmann
Committed by Herbert Xu
1 parent 621dd36929
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

crypto: cast5 - Fix checkpatch errors 

Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

... ... @@ -569,12 +569,12 @@
569 569 0xeaee6801, 0x8db2a283, 0xea8bf59e
570 570 };
571 571  
572   -#define F1(D,m,r) ( (I = ((m) + (D))), (I=rol32(I,(r))), \
573   - (((s1[I >> 24] ^ s2[(I>>16)&0xff]) - s3[(I>>8)&0xff]) + s4[I&0xff]) )
574   -#define F2(D,m,r) ( (I = ((m) ^ (D))), (I=rol32(I,(r))), \
575   - (((s1[I >> 24] - s2[(I>>16)&0xff]) + s3[(I>>8)&0xff]) ^ s4[I&0xff]) )
576   -#define F3(D,m,r) ( (I = ((m) - (D))), (I=rol32(I,(r))), \
577   - (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) )
  572 +#define F1(D, m, r) ((I = ((m) + (D))), (I = rol32(I, (r))), \
  573 + (((s1[I >> 24] ^ s2[(I>>16)&0xff]) - s3[(I>>8)&0xff]) + s4[I&0xff]))
  574 +#define F2(D, m, r) ((I = ((m) ^ (D))), (I = rol32(I, (r))), \
  575 + (((s1[I >> 24] - s2[(I>>16)&0xff]) + s3[(I>>8)&0xff]) ^ s4[I&0xff]))
  576 +#define F3(D, m, r) ((I = ((m) - (D))), (I = rol32(I, (r))), \
  577 + (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]))
578 578  
579 579  
580 580 static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
... ... @@ -694,7 +694,7 @@
694 694 dst[1] = cpu_to_be32(l);
695 695 }
696 696  
697   -static void key_schedule(u32 * x, u32 * z, u32 * k)
  697 +static void key_schedule(u32 *x, u32 *z, u32 *k)
698 698 {
699 699  
700 700 #define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff)