altera-stapl: Use swap() instead of open coding it
authorJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Thu, 5 May 2022 08:15:39 +0000 (16:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2022 13:39:45 +0000 (15:39 +0200)
Clean the following coccicheck warning:

./drivers/misc/altera-stapl/altera.c:955:51-52: WARNING opportunity for
swap().

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220505081539.91575-1-jiapeng.chong@linux.alibaba.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/altera-stapl/altera.c

index 92c0611..075f3a3 100644 (file)
@@ -530,11 +530,8 @@ exit_done:
                        }
                        break;
                case OP_SWP:
-                       if (altera_check_stack(stack_ptr, 2, &status)) {
-                               long_tmp = stack[stack_ptr - 2];
-                               stack[stack_ptr - 2] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, 2, &status))
+                               swap(stack[stack_ptr - 2], stack[stack_ptr - 1]);
                        break;
                case OP_ADD:
                        if (altera_check_stack(stack_ptr, 2, &status)) {
@@ -912,34 +909,22 @@ exit_done:
                         */
 
                        /* SWP  */
-                       if (altera_check_stack(stack_ptr, 2, &status)) {
-                               long_tmp = stack[stack_ptr - 2];
-                               stack[stack_ptr - 2] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, 2, &status))
+                               swap(stack[stack_ptr - 2], stack[stack_ptr - 1]);
 
                        /* SWPN 7 */
                        index = 7 + 1;
-                       if (altera_check_stack(stack_ptr, index, &status)) {
-                               long_tmp = stack[stack_ptr - index];
-                               stack[stack_ptr - index] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, index, &status))
+                               swap(stack[stack_ptr - index], stack[stack_ptr - 1]);
 
                        /* SWP  */
-                       if (altera_check_stack(stack_ptr, 2, &status)) {
-                               long_tmp = stack[stack_ptr - 2];
-                               stack[stack_ptr - 2] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, 2, &status))
+                               swap(stack[stack_ptr - 2], stack[stack_ptr - 1]);
 
                        /* SWPN 6 */
                        index = 6 + 1;
-                       if (altera_check_stack(stack_ptr, index, &status)) {
-                               long_tmp = stack[stack_ptr - index];
-                               stack[stack_ptr - index] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, index, &status))
+                               swap(stack[stack_ptr - index], stack[stack_ptr - 1]);
 
                        /* DUPN 8 */
                        index = 8 + 1;
@@ -950,18 +935,12 @@ exit_done:
 
                        /* SWPN 2 */
                        index = 2 + 1;
-                       if (altera_check_stack(stack_ptr, index, &status)) {
-                               long_tmp = stack[stack_ptr - index];
-                               stack[stack_ptr - index] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, index, &status))
+                               swap(stack[stack_ptr - index], stack[stack_ptr - 1]);
 
                        /* SWP  */
-                       if (altera_check_stack(stack_ptr, 2, &status)) {
-                               long_tmp = stack[stack_ptr - 2];
-                               stack[stack_ptr - 2] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, 2, &status))
+                               swap(stack[stack_ptr - 2], stack[stack_ptr - 1]);
 
                        /* DUPN 6 */
                        index = 6 + 1;
@@ -1075,11 +1054,8 @@ exit_done:
                         * to swap with top element
                         */
                        index = (args[0]) + 1;
-                       if (altera_check_stack(stack_ptr, index, &status)) {
-                               long_tmp = stack[stack_ptr - index];
-                               stack[stack_ptr - index] = stack[stack_ptr - 1];
-                               stack[stack_ptr - 1] = long_tmp;
-                       }
+                       if (altera_check_stack(stack_ptr, index, &status))
+                               swap(stack[stack_ptr - index], stack[stack_ptr - 1]);
                        break;
                case OP_DUPN:
                        /*