Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 033b8a33 authored by Liu Yu's avatar Liu Yu Committed by Kumar Gala
Browse files

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: default avatarLiu Yu <yu.liu@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 463a8c01

arch/powerpc/math-emu/fadd.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ fadd(void *frD, void *frA, void *frB) 
	FP_DECL_D(B);

	FP_DECL_D(B);

	FP_DECL_D(R);

	FP_DECL_D(R);

	FP_DECL_EX;

	FP_DECL_EX;

	int ret = 0;





#ifdef DEBUG

#ifdef DEBUG

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);

arch/powerpc/math-emu/fcmpo.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB) 
	FP_DECL_EX;

	FP_DECL_EX;

	int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };

	int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };

	long cmp;

	long cmp;

	int ret = 0;





#ifdef DEBUG

#ifdef DEBUG

	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);

	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
@@ -29,7 +28,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB) 
#endif

#endif





	if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN)

	if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN)

		ret |= EFLAG_VXVC;

		FP_SET_EXCEPTION(EFLAG_VXVC);





	FP_CMP_D(cmp, A, B, 2);

	FP_CMP_D(cmp, A, B, 2);

	cmp = code[(cmp + 1) & 3];

	cmp = code[(cmp + 1) & 3];
@@ -44,5 +43,5 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB) 
	printk("CR: %08x\n", *ccr);

	printk("CR: %08x\n", *ccr);

#endif

#endif





	return ret;

	return FP_CUR_EXCEPTIONS;

}
 
}

arch/powerpc/math-emu/fdiv.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ fdiv(void *frD, void *frA, void *frB) 
	FP_DECL_D(B);

	FP_DECL_D(B);

	FP_DECL_D(R);

	FP_DECL_D(R);

	FP_DECL_EX;

	FP_DECL_EX;

	int ret = 0;





#ifdef DEBUG

#ifdef DEBUG

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
@@ -28,22 +27,22 @@ fdiv(void *frD, void *frA, void *frB) 
#endif

#endif





	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {

	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {

		ret |= EFLAG_VXZDZ;

		FP_SET_EXCEPTION(EFLAG_VXZDZ);

#ifdef DEBUG

#ifdef DEBUG

		printk("%s: FPSCR_VXZDZ raised\n", __func__);

		printk("%s: FPSCR_VXZDZ raised\n", __func__);

#endif

#endif

	}

	}

	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {

	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {

		ret |= EFLAG_VXIDI;

		FP_SET_EXCEPTION(EFLAG_VXIDI);

#ifdef DEBUG

#ifdef DEBUG

		printk("%s: FPSCR_VXIDI raised\n", __func__);

		printk("%s: FPSCR_VXIDI raised\n", __func__);

#endif

#endif

	}

	}





	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {

	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {

		ret |= EFLAG_DIVZERO;

		FP_SET_EXCEPTION(EFLAG_DIVZERO);

		if (__FPU_TRAP_P(EFLAG_DIVZERO))

		if (__FPU_TRAP_P(EFLAG_DIVZERO))

			return ret;

			return FP_CUR_EXCEPTIONS;

	}

	}

	FP_DIV_D(R, A, B);

	FP_DIV_D(R, A, B);

arch/powerpc/math-emu/fdivs.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ fdivs(void *frD, void *frA, void *frB) 
	FP_DECL_D(B);

	FP_DECL_D(B);

	FP_DECL_D(R);

	FP_DECL_D(R);

	FP_DECL_EX;

	FP_DECL_EX;

	int ret = 0;





#ifdef DEBUG

#ifdef DEBUG

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);

	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
@@ -29,22 +28,22 @@ fdivs(void *frD, void *frA, void *frB) 
#endif

#endif





	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {

	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {

		ret |= EFLAG_VXZDZ;

		FP_SET_EXCEPTION(EFLAG_VXZDZ);

#ifdef DEBUG

#ifdef DEBUG

		printk("%s: FPSCR_VXZDZ raised\n", __func__);

		printk("%s: FPSCR_VXZDZ raised\n", __func__);

#endif

#endif

	}

	}

	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {

	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {

		ret |= EFLAG_VXIDI;

		FP_SET_EXCEPTION(EFLAG_VXIDI);

#ifdef DEBUG

#ifdef DEBUG

		printk("%s: FPSCR_VXIDI raised\n", __func__);

		printk("%s: FPSCR_VXIDI raised\n", __func__);

#endif

#endif

	}

	}





	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {

	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {

		ret |= EFLAG_DIVZERO;

		FP_SET_EXCEPTION(EFLAG_DIVZERO);

		if (__FPU_TRAP_P(EFLAG_DIVZERO))

		if (__FPU_TRAP_P(EFLAG_DIVZERO))

			return ret;

			return FP_CUR_EXCEPTIONS;

	}

	}





	FP_DIV_D(R, A, B);

	FP_DIV_D(R, A, B);

arch/powerpc/math-emu/fmadd.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ fmadd(void *frD, void *frA, void *frB, void *frC) 
	FP_DECL_D(C);

	FP_DECL_D(C);

	FP_DECL_D(T);

	FP_DECL_D(T);

	FP_DECL_EX;

	FP_DECL_EX;

	int ret = 0;





#ifdef DEBUG

#ifdef DEBUG

	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);

	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
@@ -33,12 +32,12 @@ fmadd(void *frD, void *frA, void *frB, void *frC) 




	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||

	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||

	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))

	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))

                ret |= EFLAG_VXIMZ;

                FP_SET_EXCEPTION(EFLAG_VXIMZ);





	FP_MUL_D(T, A, C);

	FP_MUL_D(T, A, C);





	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)

	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)

		ret |= EFLAG_VXISI;

		FP_SET_EXCEPTION(EFLAG_VXISI);





	FP_ADD_D(R, T, B);

	FP_ADD_D(R, T, B);