2021-04-12 10:06:14

by Jiabing Wan

Subject: [PATCH] powerpc: alignment: Remove unneeded variables

Fix coccicheck warning:

./tools/testing/selftests/powerpc/alignment/alignment_handler.c:539:5-7:
Unneeded variable: "rc". Return "0" on line 562
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:567:5-7:
Unneeded variable: "rc". Return "0" on line 580
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:585:5-7:
Unneeded variable: "rc". Return "0" on line 594
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:600:5-7:
Unneeded variable: "rc". Return "0" on line 611
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:416:5-7:
Unneeded variable: "rc". Return "0" on line 470
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:475:5-7:
Unneeded variable: "rc". Return "0" on line 485
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:490:5-7:
Unneeded variable: "rc". Return "0" on line 506
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:511:5-7:
Unneeded variable: "rc". Return "0" on line 534
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:331:5-7:
Unneeded variable: "rc". Return "0" on line 344
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:349:5-7:
Unneeded variable: "rc". Return "0" on line 360
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:365:5-7:
Unneeded variable: "rc". Return "0" on line 392
./tools/testing/selftests/powerpc/alignment/alignment_handler.c:397:5-7:
Unneeded variable: "rc". Return "0" on line 411

Signed-off-by: Wan Jiabing <[email protected]>
---
.../powerpc/alignment/alignment_handler.c | 48 +++++--------------
1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/tools/testing/selftests/powerpc/alignment/alignment_handler.c b/tools/testing/selftests/powerpc/alignment/alignment_handler.c
index c25cf7cd45e9..48bfb7b36d84 100644
--- a/tools/testing/selftests/powerpc/alignment/alignment_handler.c
+++ b/tools/testing/selftests/powerpc/alignment/alignment_handler.c
@@ -328,8 +328,6 @@ static bool can_open_cifile(void)

int test_alignment_handler_vsx_206(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

@@ -341,13 +339,11 @@ int test_alignment_handler_vsx_206(void)
STORE_VSX_XFORM_TEST(stxvd2x);
STORE_VSX_XFORM_TEST(stxvw4x);
STORE_VSX_XFORM_TEST(stxsdx);
- return rc;
+ return 0;
}

int test_alignment_handler_vsx_207(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));

@@ -357,13 +353,11 @@ int test_alignment_handler_vsx_207(void)
LOAD_VSX_XFORM_TEST(lxsiwzx);
STORE_VSX_XFORM_TEST(stxsspx);
STORE_VSX_XFORM_TEST(stxsiwx);
- return rc;
+ return 0;
}

int test_alignment_handler_vsx_300(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());

SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_00));
@@ -389,13 +383,11 @@ int test_alignment_handler_vsx_300(void)
STORE_VSX_XFORM_TEST(stxvx);
STORE_VSX_XFORM_TEST(stxvl);
STORE_VSX_XFORM_TEST(stxvll);
- return rc;
+ return 0;
}

int test_alignment_handler_vsx_prefix(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));

@@ -408,13 +400,11 @@ int test_alignment_handler_vsx_prefix(void)
STORE_VSX_8LS_PREFIX_TEST(PSTXSSP, 0);
STORE_VSX_8LS_PREFIX_TEST(PSTXV0, 0);
STORE_VSX_8LS_PREFIX_TEST(PSTXV1, 1);
- return rc;
+ return 0;
}

int test_alignment_handler_integer(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());

printf("Integer\n");
@@ -467,13 +457,11 @@ int test_alignment_handler_integer(void)
STORE_DFORM_TEST(stmw);
#endif

- return rc;
+ return 0;
}

int test_alignment_handler_integer_206(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

@@ -482,13 +470,11 @@ int test_alignment_handler_integer_206(void)
LOAD_XFORM_TEST(ldbrx);
STORE_XFORM_TEST(stdbrx);

- return rc;
+ return 0;
}

int test_alignment_handler_integer_prefix(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));

@@ -503,13 +489,11 @@ int test_alignment_handler_integer_prefix(void)
STORE_MLS_PREFIX_TEST(PSTH);
STORE_MLS_PREFIX_TEST(PSTW);
STORE_8LS_PREFIX_TEST(PSTD);
- return rc;
+ return 0;
}

int test_alignment_handler_vmx(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap(PPC_FEATURE_HAS_ALTIVEC));

@@ -531,13 +515,11 @@ int test_alignment_handler_vmx(void)
STORE_VMX_XFORM_TEST(stvehx);
STORE_VMX_XFORM_TEST(stvewx);
STORE_VMX_XFORM_TEST(stvxl);
- return rc;
+ return 0;
}

int test_alignment_handler_fp(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());

printf("Floating point\n");
@@ -559,13 +541,11 @@ int test_alignment_handler_fp(void)
STORE_FLOAT_XFORM_TEST(stfsux);
STORE_FLOAT_XFORM_TEST(stfiwx);

- return rc;
+ return 0;
}

int test_alignment_handler_fp_205(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_05));

@@ -577,13 +557,11 @@ int test_alignment_handler_fp_205(void)
STORE_FLOAT_DFORM_TEST(stfdp);
STORE_FLOAT_XFORM_TEST(stfdpx);

- return rc;
+ return 0;
}

int test_alignment_handler_fp_206(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

@@ -591,14 +569,12 @@ int test_alignment_handler_fp_206(void)

LOAD_FLOAT_XFORM_TEST(lfiwzx);

- return rc;
+ return 0;
}


int test_alignment_handler_fp_prefix(void)
{
- int rc = 0;
-
SKIP_IF(!can_open_cifile());
SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));

@@ -608,7 +584,7 @@ int test_alignment_handler_fp_prefix(void)
LOAD_FLOAT_MLS_PREFIX_TEST(PLFD);
STORE_FLOAT_MLS_PREFIX_TEST(PSTFS);
STORE_FLOAT_MLS_PREFIX_TEST(PSTFD);
- return rc;
+ return 0;
}

void usage(char *prog)
--
2.30.2

2021-04-12 11:04:02

by Christophe Leroy

Subject: Re: [PATCH] powerpc: alignment: Remove unneeded variables

Le 12/04/2021 à 11:59, Wan Jiabing a écrit :
> Fix coccicheck warning:

Can you mention in the commit subject that it is selftests and not the core part of powerpc which is
addressed here ?

>
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:539:5-7:
> Unneeded variable: "rc". Return "0" on line 562
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:567:5-7:
> Unneeded variable: "rc". Return "0" on line 580
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:585:5-7:
> Unneeded variable: "rc". Return "0" on line 594
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:600:5-7:
> Unneeded variable: "rc". Return "0" on line 611
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:416:5-7:
> Unneeded variable: "rc". Return "0" on line 470
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:475:5-7:
> Unneeded variable: "rc". Return "0" on line 485
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:490:5-7:
> Unneeded variable: "rc". Return "0" on line 506
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:511:5-7:
> Unneeded variable: "rc". Return "0" on line 534
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:331:5-7:
> Unneeded variable: "rc". Return "0" on line 344
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:349:5-7:
> Unneeded variable: "rc". Return "0" on line 360
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:365:5-7:
> Unneeded variable: "rc". Return "0" on line 392
> ./tools/testing/selftests/powerpc/alignment/alignment_handler.c:397:5-7:
> Unneeded variable: "rc". Return "0" on line 411
>
> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> .../powerpc/alignment/alignment_handler.c | 48 +++++--------------
> 1 file changed, 12 insertions(+), 36 deletions(-)
>
> diff --git a/tools/testing/selftests/powerpc/alignment/alignment_handler.c b/tools/testing/selftests/powerpc/alignment/alignment_handler.c
> index c25cf7cd45e9..48bfb7b36d84 100644
> --- a/tools/testing/selftests/powerpc/alignment/alignment_handler.c
> +++ b/tools/testing/selftests/powerpc/alignment/alignment_handler.c
> @@ -328,8 +328,6 @@ static bool can_open_cifile(void)
>
> int test_alignment_handler_vsx_206(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));
>
> @@ -341,13 +339,11 @@ int test_alignment_handler_vsx_206(void)
> STORE_VSX_XFORM_TEST(stxvd2x);
> STORE_VSX_XFORM_TEST(stxvw4x);
> STORE_VSX_XFORM_TEST(stxsdx);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_vsx_207(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
>
> @@ -357,13 +353,11 @@ int test_alignment_handler_vsx_207(void)
> LOAD_VSX_XFORM_TEST(lxsiwzx);
> STORE_VSX_XFORM_TEST(stxsspx);
> STORE_VSX_XFORM_TEST(stxsiwx);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_vsx_300(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
>
> SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_00));
> @@ -389,13 +383,11 @@ int test_alignment_handler_vsx_300(void)
> STORE_VSX_XFORM_TEST(stxvx);
> STORE_VSX_XFORM_TEST(stxvl);
> STORE_VSX_XFORM_TEST(stxvll);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_vsx_prefix(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));
>
> @@ -408,13 +400,11 @@ int test_alignment_handler_vsx_prefix(void)
> STORE_VSX_8LS_PREFIX_TEST(PSTXSSP, 0);
> STORE_VSX_8LS_PREFIX_TEST(PSTXV0, 0);
> STORE_VSX_8LS_PREFIX_TEST(PSTXV1, 1);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_integer(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
>
> printf("Integer\n");
> @@ -467,13 +457,11 @@ int test_alignment_handler_integer(void)
> STORE_DFORM_TEST(stmw);
> #endif
>
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_integer_206(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));
>
> @@ -482,13 +470,11 @@ int test_alignment_handler_integer_206(void)
> LOAD_XFORM_TEST(ldbrx);
> STORE_XFORM_TEST(stdbrx);
>
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_integer_prefix(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));
>
> @@ -503,13 +489,11 @@ int test_alignment_handler_integer_prefix(void)
> STORE_MLS_PREFIX_TEST(PSTH);
> STORE_MLS_PREFIX_TEST(PSTW);
> STORE_8LS_PREFIX_TEST(PSTD);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_vmx(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap(PPC_FEATURE_HAS_ALTIVEC));
>
> @@ -531,13 +515,11 @@ int test_alignment_handler_vmx(void)
> STORE_VMX_XFORM_TEST(stvehx);
> STORE_VMX_XFORM_TEST(stvewx);
> STORE_VMX_XFORM_TEST(stvxl);
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_fp(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
>
> printf("Floating point\n");
> @@ -559,13 +541,11 @@ int test_alignment_handler_fp(void)
> STORE_FLOAT_XFORM_TEST(stfsux);
> STORE_FLOAT_XFORM_TEST(stfiwx);
>
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_fp_205(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_05));
>
> @@ -577,13 +557,11 @@ int test_alignment_handler_fp_205(void)
> STORE_FLOAT_DFORM_TEST(stfdp);
> STORE_FLOAT_XFORM_TEST(stfdpx);
>
> - return rc;
> + return 0;
> }
>
> int test_alignment_handler_fp_206(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));
>
> @@ -591,14 +569,12 @@ int test_alignment_handler_fp_206(void)
>
> LOAD_FLOAT_XFORM_TEST(lfiwzx);
>
> - return rc;
> + return 0;
> }
>
>
> int test_alignment_handler_fp_prefix(void)
> {
> - int rc = 0;
> -
> SKIP_IF(!can_open_cifile());
> SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1));
>
> @@ -608,7 +584,7 @@ int test_alignment_handler_fp_prefix(void)
> LOAD_FLOAT_MLS_PREFIX_TEST(PLFD);
> STORE_FLOAT_MLS_PREFIX_TEST(PSTFS);
> STORE_FLOAT_MLS_PREFIX_TEST(PSTFD);
> - return rc;
> + return 0;
> }
>
> void usage(char *prog)
>