Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Robert Moore <robert.moore@intel.com>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Len Brown <lenb@kernel.org>, linux-acpi@vger.kernel.org,
        devel@acpica.org, linux-kernel@vger.kernel.org
Cc:     kernel@vivo.com, Guo Zhengkui <guozhengkui@vivo.com>
Subject: [PATCH] ACPICA: fix swap.cocci warning
Date:   Tue,  9 Nov 2021 21:47:27 +0800
Message-Id: <20211109134728.1710-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M10HYvb94XJtOtUVsnwF5Brt2m3NmADwbiuLxWtF7gItCgKwXhFjW2lqgq6U?=
 =?us-ascii?Q?SZ9vPeGDOlfhbTFLa/VsHQQkMZnFsUZW5YJ1HQ5S2VcURHu1mbkAsuFC4jkc?=
 =?us-ascii?Q?NcyZb4qBfWEiG+b4XIS8NwDZV8BJ56aG17rX8hVyivX3G2ScKp9q8jBvB+KN?=
 =?us-ascii?Q?ra3abxkZL2SaMXYWVBvvzQo8hDy6aXq7Myrks7D3rCTqABf88EeZpxew0lLr?=
 =?us-ascii?Q?wvMG9D/AkqDzyeoUclFuOGyajw/UNjrSSiwYrCUzkwMOfMlQfeOIt6xfTliK?=
 =?us-ascii?Q?pQ5yh+NyP61YSoOELIE2TDQQICSCELA9PW2O7a5g0svQzB0fXW5YGPrrWsbC?=
 =?us-ascii?Q?GA/JIudkQcXh5MRKO8BuV5E5UXXeg4kkjkoeD5DajCiiuTAosaLE4NcNKjat?=
 =?us-ascii?Q?/NbcmisLuVFOhAmfA+NMPiTK9SR07CSfzl5084ydUi1BurwveUZtmTKNGyQS?=
 =?us-ascii?Q?lD2pGQR7txichYrlghOWbD/IzaPZk+FYpqOMhSfXx0prqd50K6e6pyqZkPgc?=
 =?us-ascii?Q?T6Gwv617oARyPIDh+9cR1Yrswdj2iM9eMuI3qmRYcjeXdt8TZ8Y2x9owDBph?=
 =?us-ascii?Q?NM9AOXoHwMkOKWwtXSxNbkZPGoQYKkLNrDSIjfX2yzMxscvNltKxww6hnt2I?=
 =?us-ascii?Q?wrezYx1trzJ7mdHt4+HMYJmcuTuRlec3Cr0epjVGeK4Wr3hjV/MEVFFmeB1A?=
 =?us-ascii?Q?Cbi9Hu0QjBOqaW+I0nyO/basGIZq4OirUfE4i4eD0WZ21CwJ6eYMZ5NHUz3y?=
 =?us-ascii?Q?Z8fxEKKn9iE8yD3wJW4AIVdrajIPnfRbaBJ82VCzSjGW7vk679IE7vxD0p7X?=
 =?us-ascii?Q?1MRLYiDepiAKXskY7hAaHJdrrod2QTmJeWhtOnrzUjXyKAykJ+bQEe1I/NTa?=
 =?us-ascii?Q?tvn0X3HD6Svn7pDcc+X8OH542+Zw2XoVrnHhLOvxrEeVBUCPhKoeVXFz3TS8?=
 =?us-ascii?Q?NF6kqwC5iBaB4r+jkt4ZF83toidJeY//00YGqq995xpRddar7R50+PUipTtZ?=
 =?us-ascii?Q?LRLDzdTCnF+faX1cY+nhEpAWjPbYo15RfsJwFQkJgyohBiBXVE/Hvxq5z2PU?=
 =?us-ascii?Q?gJqULBYCN/ZtndjCAVsgPiOsOyKXMEY3C3j0ljxS9M3nNlMVN9Kp0AQV/xRI?=
 =?us-ascii?Q?h2qpsHVa4z9PEJrHdBETVu6O1HsbfrZDGYFbrzYzn6ufcCzJymwjjQGPtCHk?=
 =?us-ascii?Q?vwY0EmJu1fkhmFvGXaCnTRoz+S/9hkE/2DQvKxVnXQr/G7rqgz8fMARO/dIB?=
 =?us-ascii?Q?ux9MvbPCuM4VsBGS0NfhWDGME/bFKGpboNKOdggQLXc7cGb3ACqq3GdVwHTa?=
 =?us-ascii?Q?w9EqbRfVksmmXw2F36YWaqnO4LhiwjUB8LKoja2ILVpOyIC9mVIICoZ5PAvd?=
 =?us-ascii?Q?V/OcOvuEOmNkRCF8tk7LDZbET/sCGFzZ7KWfIDbWu9erzEea34vzOYmqM8L0?=
 =?us-ascii?Q?Py6K6L87Wfp4BGdOEtwZWDAU3iK1WfbzKdnQE6OiKEQxhhhM8kEg3JZ9E0lk?=
 =?us-ascii?Q?/ioM/z2cGsQRTcO37P1Oh2Gp7axBCXX8anrdcctRI5lAVbty8o0CLW1539Er?=
 =?us-ascii?Q?JMC1NnlvyK5znxisIbUuejzRvQtRheG0LGsLZ2UyimuB8d6emYERqzSpn/LB?=
 =?us-ascii?Q?HWVF0qyRk2lkFocUHtFRYXc=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d9e0b141-1c7b-4168-c528-08d9a3877e83
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 13:47:38.9632
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eQhLdtdfo4eFvkRgGFuE3wryr3A6BamrHbCHVOxbAL6LVNL9iAXUj8/VTTzHV4o4B3nnKydaZ9Qv2sHFku0Gag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK0PR06MB2258
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix following swap.cocci warning:
./drivers/acpi/acpica/nsrepair2.c:896:33-34: WARNING
opportunity for swap()

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/acpi/acpica/nsrepair2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 14b71b41e845..02a904ca4caf 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -8,6 +8,7 @@
  *
  *****************************************************************************/
 
+#include <linux/minmax.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -875,7 +876,6 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
 {
 	union acpi_operand_object *obj_desc1;
 	union acpi_operand_object *obj_desc2;
-	union acpi_operand_object *temp_obj;
 	u32 i;
 	u32 j;
 
@@ -892,9 +892,7 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
 			    || ((sort_direction == ACPI_SORT_DESCENDING)
 				&& (obj_desc1->integer.value <
 				    obj_desc2->integer.value))) {
-				temp_obj = elements[j - 1];
-				elements[j - 1] = elements[j];
-				elements[j] = temp_obj;
+				swap(elements[j - 1], elements[j]);
 			}
 		}
 	}
-- 
2.20.1