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

powerpc/math-emu: Remove redundant 'ret'

FP_DECL_EX is already used, so ret is redundant.
And FP_SET_EXCEPTION will add status into return value.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Liu Yu and committed by
Kumar Gala 033b8a33 463a8c01

+34 -52
-1
arch/powerpc/math-emu/fadd.c
··· 13 13 FP_DECL_D(B); 14 14 FP_DECL_D(R); 15 15 FP_DECL_EX; 16 - int ret = 0; 17 16 18 17 #ifdef DEBUG 19 18 printk("%s: %p %p %p\n", __func__, frD, frA, frB);
+2 -3
arch/powerpc/math-emu/fcmpo.c
··· 14 14 FP_DECL_EX; 15 15 int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) }; 16 16 long cmp; 17 - int ret = 0; 18 17 19 18 #ifdef DEBUG 20 19 printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB); ··· 28 29 #endif 29 30 30 31 if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN) 31 - ret |= EFLAG_VXVC; 32 + FP_SET_EXCEPTION(EFLAG_VXVC); 32 33 33 34 FP_CMP_D(cmp, A, B, 2); 34 35 cmp = code[(cmp + 1) & 3]; ··· 43 44 printk("CR: %08x\n", *ccr); 44 45 #endif 45 46 46 - return ret; 47 + return FP_CUR_EXCEPTIONS; 47 48 }
+4 -5
arch/powerpc/math-emu/fdiv.c
··· 13 13 FP_DECL_D(B); 14 14 FP_DECL_D(R); 15 15 FP_DECL_EX; 16 - int ret = 0; 17 16 18 17 #ifdef DEBUG 19 18 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 27 28 #endif 28 29 29 30 if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { 30 - ret |= EFLAG_VXZDZ; 31 + FP_SET_EXCEPTION(EFLAG_VXZDZ); 31 32 #ifdef DEBUG 32 33 printk("%s: FPSCR_VXZDZ raised\n", __func__); 33 34 #endif 34 35 } 35 36 if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) { 36 - ret |= EFLAG_VXIDI; 37 + FP_SET_EXCEPTION(EFLAG_VXIDI); 37 38 #ifdef DEBUG 38 39 printk("%s: FPSCR_VXIDI raised\n", __func__); 39 40 #endif 40 41 } 41 42 42 43 if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) { 43 - ret |= EFLAG_DIVZERO; 44 + FP_SET_EXCEPTION(EFLAG_DIVZERO); 44 45 if (__FPU_TRAP_P(EFLAG_DIVZERO)) 45 - return ret; 46 + return FP_CUR_EXCEPTIONS; 46 47 } 47 48 FP_DIV_D(R, A, B); 48 49
+4 -5
arch/powerpc/math-emu/fdivs.c
··· 14 14 FP_DECL_D(B); 15 15 FP_DECL_D(R); 16 16 FP_DECL_EX; 17 - int ret = 0; 18 17 19 18 #ifdef DEBUG 20 19 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 28 29 #endif 29 30 30 31 if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { 31 - ret |= EFLAG_VXZDZ; 32 + FP_SET_EXCEPTION(EFLAG_VXZDZ); 32 33 #ifdef DEBUG 33 34 printk("%s: FPSCR_VXZDZ raised\n", __func__); 34 35 #endif 35 36 } 36 37 if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) { 37 - ret |= EFLAG_VXIDI; 38 + FP_SET_EXCEPTION(EFLAG_VXIDI); 38 39 #ifdef DEBUG 39 40 printk("%s: FPSCR_VXIDI raised\n", __func__); 40 41 #endif 41 42 } 42 43 43 44 if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) { 44 - ret |= EFLAG_DIVZERO; 45 + FP_SET_EXCEPTION(EFLAG_DIVZERO); 45 46 if (__FPU_TRAP_P(EFLAG_DIVZERO)) 46 - return ret; 47 + return FP_CUR_EXCEPTIONS; 47 48 } 48 49 49 50 FP_DIV_D(R, A, B);
+2 -3
arch/powerpc/math-emu/fmadd.c
··· 15 15 FP_DECL_D(C); 16 16 FP_DECL_D(T); 17 17 FP_DECL_EX; 18 - int ret = 0; 19 18 20 19 #ifdef DEBUG 21 20 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 32 33 33 34 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 34 35 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 35 - ret |= EFLAG_VXIMZ; 36 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 36 37 37 38 FP_MUL_D(T, A, C); 38 39 39 40 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 40 - ret |= EFLAG_VXISI; 41 + FP_SET_EXCEPTION(EFLAG_VXISI); 41 42 42 43 FP_ADD_D(R, T, B); 43 44
+2 -3
arch/powerpc/math-emu/fmadds.c
··· 16 16 FP_DECL_D(C); 17 17 FP_DECL_D(T); 18 18 FP_DECL_EX; 19 - int ret = 0; 20 19 21 20 #ifdef DEBUG 22 21 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 33 34 34 35 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 35 36 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 36 - ret |= EFLAG_VXIMZ; 37 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 37 38 38 39 FP_MUL_D(T, A, C); 39 40 40 41 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 41 - ret |= EFLAG_VXISI; 42 + FP_SET_EXCEPTION(EFLAG_VXISI); 42 43 43 44 FP_ADD_D(R, T, B); 44 45
+2 -3
arch/powerpc/math-emu/fmsub.c
··· 15 15 FP_DECL_D(C); 16 16 FP_DECL_D(T); 17 17 FP_DECL_EX; 18 - int ret = 0; 19 18 20 19 #ifdef DEBUG 21 20 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 32 33 33 34 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 34 35 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 35 - ret |= EFLAG_VXIMZ; 36 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 36 37 37 38 FP_MUL_D(T, A, C); 38 39 ··· 40 41 B_s ^= 1; 41 42 42 43 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 43 - ret |= EFLAG_VXISI; 44 + FP_SET_EXCEPTION(EFLAG_VXISI); 44 45 45 46 FP_ADD_D(R, T, B); 46 47
+2 -3
arch/powerpc/math-emu/fmsubs.c
··· 16 16 FP_DECL_D(C); 17 17 FP_DECL_D(T); 18 18 FP_DECL_EX; 19 - int ret = 0; 20 19 21 20 #ifdef DEBUG 22 21 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 33 34 34 35 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 35 36 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 36 - ret |= EFLAG_VXIMZ; 37 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 37 38 38 39 FP_MUL_D(T, A, C); 39 40 ··· 41 42 B_s ^= 1; 42 43 43 44 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 44 - ret |= EFLAG_VXISI; 45 + FP_SET_EXCEPTION(EFLAG_VXISI); 45 46 46 47 FP_ADD_D(R, T, B); 47 48
+1 -2
arch/powerpc/math-emu/fmul.c
··· 13 13 FP_DECL_D(B); 14 14 FP_DECL_D(R); 15 15 FP_DECL_EX; 16 - int ret = 0; 17 16 18 17 #ifdef DEBUG 19 18 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 30 31 31 32 if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) || 32 33 (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF)) 33 - ret |= EFLAG_VXIMZ; 34 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 34 35 35 36 FP_MUL_D(R, A, B); 36 37
+1 -2
arch/powerpc/math-emu/fmuls.c
··· 14 14 FP_DECL_D(B); 15 15 FP_DECL_D(R); 16 16 FP_DECL_EX; 17 - int ret = 0; 18 17 19 18 #ifdef DEBUG 20 19 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 31 32 32 33 if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) || 33 34 (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF)) 34 - ret |= EFLAG_VXIMZ; 35 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 35 36 36 37 FP_MUL_D(R, A, B); 37 38
+2 -3
arch/powerpc/math-emu/fnmadd.c
··· 15 15 FP_DECL_D(C); 16 16 FP_DECL_D(T); 17 17 FP_DECL_EX; 18 - int ret = 0; 19 18 20 19 #ifdef DEBUG 21 20 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 32 33 33 34 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 34 35 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 35 - ret |= EFLAG_VXIMZ; 36 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 36 37 37 38 FP_MUL_D(T, A, C); 38 39 39 40 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 40 - ret |= EFLAG_VXISI; 41 + FP_SET_EXCEPTION(EFLAG_VXISI); 41 42 42 43 FP_ADD_D(R, T, B); 43 44
+2 -3
arch/powerpc/math-emu/fnmadds.c
··· 16 16 FP_DECL_D(C); 17 17 FP_DECL_D(T); 18 18 FP_DECL_EX; 19 - int ret = 0; 20 19 21 20 #ifdef DEBUG 22 21 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 33 34 34 35 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 35 36 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 36 - ret |= EFLAG_VXIMZ; 37 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 37 38 38 39 FP_MUL_D(T, A, C); 39 40 40 41 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 41 - ret |= EFLAG_VXISI; 42 + FP_SET_EXCEPTION(EFLAG_VXISI); 42 43 43 44 FP_ADD_D(R, T, B); 44 45
+2 -3
arch/powerpc/math-emu/fnmsub.c
··· 15 15 FP_DECL_D(C); 16 16 FP_DECL_D(T); 17 17 FP_DECL_EX; 18 - int ret = 0; 19 18 20 19 #ifdef DEBUG 21 20 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 32 33 33 34 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 34 35 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 35 - ret |= EFLAG_VXIMZ; 36 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 36 37 37 38 FP_MUL_D(T, A, C); 38 39 ··· 40 41 B_s ^= 1; 41 42 42 43 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 43 - ret |= EFLAG_VXISI; 44 + FP_SET_EXCEPTION(EFLAG_VXISI); 44 45 45 46 FP_ADD_D(R, T, B); 46 47
+2 -3
arch/powerpc/math-emu/fnmsubs.c
··· 16 16 FP_DECL_D(C); 17 17 FP_DECL_D(T); 18 18 FP_DECL_EX; 19 - int ret = 0; 20 19 21 20 #ifdef DEBUG 22 21 printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC); ··· 33 34 34 35 if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) || 35 36 (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF)) 36 - ret |= EFLAG_VXIMZ; 37 + FP_SET_EXCEPTION(EFLAG_VXIMZ); 37 38 38 39 FP_MUL_D(T, A, C); 39 40 ··· 41 42 B_s ^= 1; 42 43 43 44 if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF) 44 - ret |= EFLAG_VXISI; 45 + FP_SET_EXCEPTION(EFLAG_VXISI); 45 46 46 47 FP_ADD_D(R, T, B); 47 48
+2 -3
arch/powerpc/math-emu/fsqrt.c
··· 12 12 FP_DECL_D(B); 13 13 FP_DECL_D(R); 14 14 FP_DECL_EX; 15 - int ret = 0; 16 15 17 16 #ifdef DEBUG 18 17 printk("%s: %p %p %p %p\n", __func__, frD, frB); ··· 24 25 #endif 25 26 26 27 if (B_s && B_c != FP_CLS_ZERO) 27 - ret |= EFLAG_VXSQRT; 28 + FP_SET_EXCEPTION(EFLAG_VXSQRT); 28 29 if (B_c == FP_CLS_NAN) 29 - ret |= EFLAG_VXSNAN; 30 + FP_SET_EXCEPTION(EFLAG_VXSNAN); 30 31 31 32 FP_SQRT_D(R, B); 32 33
+2 -3
arch/powerpc/math-emu/fsqrts.c
··· 13 13 FP_DECL_D(B); 14 14 FP_DECL_D(R); 15 15 FP_DECL_EX; 16 - int ret = 0; 17 16 18 17 #ifdef DEBUG 19 18 printk("%s: %p %p %p %p\n", __func__, frD, frB); ··· 25 26 #endif 26 27 27 28 if (B_s && B_c != FP_CLS_ZERO) 28 - ret |= EFLAG_VXSQRT; 29 + FP_SET_EXCEPTION(EFLAG_VXSQRT); 29 30 if (B_c == FP_CLS_NAN) 30 - ret |= EFLAG_VXSNAN; 31 + FP_SET_EXCEPTION(EFLAG_VXSNAN); 31 32 32 33 FP_SQRT_D(R, B); 33 34
+1 -2
arch/powerpc/math-emu/fsub.c
··· 13 13 FP_DECL_D(B); 14 14 FP_DECL_D(R); 15 15 FP_DECL_EX; 16 - int ret = 0; 17 16 18 17 #ifdef DEBUG 19 18 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 30 31 B_s ^= 1; 31 32 32 33 if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF) 33 - ret |= EFLAG_VXISI; 34 + FP_SET_EXCEPTION(EFLAG_VXISI); 34 35 35 36 FP_ADD_D(R, A, B); 36 37
+1 -2
arch/powerpc/math-emu/fsubs.c
··· 14 14 FP_DECL_D(B); 15 15 FP_DECL_D(R); 16 16 FP_DECL_EX; 17 - int ret = 0; 18 17 19 18 #ifdef DEBUG 20 19 printk("%s: %p %p %p\n", __func__, frD, frA, frB); ··· 31 32 B_s ^= 1; 32 33 33 34 if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF) 34 - ret |= EFLAG_VXISI; 35 + FP_SET_EXCEPTION(EFLAG_VXISI); 35 36 36 37 FP_ADD_D(R, A, B); 37 38