From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A888537647B for ; Thu, 13 Aug 2026 05:48:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786600085; cv=none; b=GcqwokuyKwzeFaPXpX+488icoH0ohFpevuXGBD5jHwpywNMVEPUiPrAaYsaZwzjCHR0IoH4y3I3mXH5UkppdccCy/Z5+VKtfSetdnnCWPbbq7ym8VDtTob9AZhUKkq708Dz4Tx1EaVpgSstGCI1N/QeFeg6pOVPgPX01encblHw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786600085; c=relaxed/simple; bh=5TXl+7FhJNDRzik5WEtBDUOOLm+EMBxf4N2AmcSdcd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Co3oFRgATXEdnnpaDo1K2MhHUhy9xr94CXMx6RQPQmMthxF+RTPoI2VmNCRJRoZB+d/CZCT0G3CnYE73dKp/LCC/vCeLyPqjE6lFAbjuzJfev/3ciJCsXA/PILe89XEsxf0VKDgLhwcFIRdN6cWQ/RBV8yhie8hgoftOD5yUC6A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Iju3+zho; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Iju3+zho" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5b2aa3be376so252169e87.0 for ; Wed, 12 Aug 2026 22:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786600081; x=1787204881; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6mNXe4icQAHTtL3mT5idpm+v38V2NUoG/qN7vf7IPgA=; b=Iju3+zho56ctK2YEnU8OzscVWB7BzDWvsAZ5DJZyxJyBYBzIrKKxVyIN1rVQqzfBiw 7s2OARX4fe+AK/qA30z/xRyF9E/9hR7CXCFnYPSqcqPK3nNpXSbLWTnOlt2IdMdRN9um ihKJ8M+3loA/HWIbnZyVpOsZDaiLiDgS3W5JXUHe4BpappDedKB2SBs6PGpz+aQ/atwa nmTkaJoNA4jQfOF4XznYvtHQ531BmG0P0ag9QyMOirOd/giHY2aeQI3WL8aNXj3AsGM4 iV5Fk1P44pLTyy3cwrrExOksfhtoBir9Mzc4HAnl+NHGJ3g9julc0BgyIHFwY5wv/4G/ OqWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786600081; x=1787204881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=6mNXe4icQAHTtL3mT5idpm+v38V2NUoG/qN7vf7IPgA=; b=LTzOIml/BttLTqGoz8QTMry+AlYsn57lAqCIRpqZadlW//gv8rEy8te0ZWlooG/YKs vZYGaD/ZH4XxGpU+P3odfsAI81AXr27A5njbwxpt9MuRzs2rseDqYA2TNkjEatjQ6Wd7 WtfTywG3t7xHAMrRvKvLmDaH8fkSYMUejO6ivPFtqRBpTz5V1BTT1i/2pRHaKPHxmV6x 6TDKtdG0OtHwu3GTofC7HuojaWJ7BY8PxMtA9idqr+ar7/rmJSQ+iaNAWuzdP3FuDriu V+t2ZL0JjKfvF0vTNinJFMxTFupEF9u/NSHJDG7Pw48ReDN1yBHNpiM2LRcRRhLmp34V qn/w== X-Forwarded-Encrypted: i=1; AHgh+RoEAWjTI0LEBKdwLo3KzVm8ZaBFy1fuEn/is8Birzav3oGZaSCVJOTLioVPxbqsXi4MUjflXoSbuIwugIw=@vger.kernel.org X-Gm-Message-State: AOJu0Yyf8gZLZCMNRYwv7UQEFuD40w9eYWPdL58NrI2IbVnJqEX+s27N rj0uHguC5zY9jFcYFvpY7ZfLJZbPc+2umQKjaGGlQW+xgQBpYHd+ws9x X-Gm-Gg: AR+sD13g1+pGTKAUOFED4qkpMF5uk9+DtLk15F/2JvdNXkNaeeC9fqWLAwNaWS+8A9h 2i8tkUyc0VW5FCacsn6pGu/q+mGYNJLkxGbiRN6biJeztnhkdQe6D2WW1qrPEOV/YrH5xCjIuW5 NwzZpaZUb5+tgVoQxLnlk4F5OI4QVh9linIvcbwevbtojSZqzDAE1xJ/trziJsyXvlNA1I4s6Z0 LUK77/p6Mjb0CqWMFR6yaMbAtff0Nkyk+WZGM1Ft11TJ7JPAcywFNojNJgEYw96J8fcGjw4yRTe 5ndUXP7EGIJ4xOgf1NIgd9gBbOVUtzXZP2L4guiZ0sv3Y5b6x2QY/SxQ0lF2iZgPQ6Cf5q9U509 UKQ1fQZ4y1GIm6fctH4cPxtMqZVghBY449qqCtMJFbH7MnMKCvjTADLTr/T/Nl5jk8MVekWtn7T Cal4kFfm41L7sayQ7BVC28o6D2OdbUmDCU4AoXB8PjQ2XrIBpc39tUY6u0cJ1LvO/JpGU35VxyM tqy2vMwGdG8mIDjmJzaMjDnnVPuzqwQERlc7QosFZTC33fP7lfC+S4i/FJpe+Lnio1wfwy9 X-Received: by 2002:a05:6512:66cf:b0:5b4:5352:e2b5 with SMTP id 2adb3069b0e04-5b453f3c39amr285039e87.15.1786600081321; Wed, 12 Aug 2026 22:48:01 -0700 (PDT) Received: from archlinux ([94.180.96.85]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9673sm252483e87.23.2026.08.12.22.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 22:48:00 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH wireless-next v2 3/4] wifi: rtw88: rtw8822c: switch to the kernel's sort() library Date: Thu, 13 Aug 2026 12:47:31 +0700 Message-ID: <4a0b85003aac26b23fcfc6e414e00b39e0d2aa45.1786599645.git.ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the custom, nested bubble-sort logic in rtw8822c_dac_iq_sort() and __rtw8822c_dac_iq_sort() with a call to the kernel's optimized heapsort implementation. Implement a concise, localized s32 comparator. Since the previous patch already guarantees that input values are properly sign-extended into signed arrays, the custom circular index sorting rules completely disappear, trimming down lines of code. Signed-off-by: Arsenii Pashchenko --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index d06986d09..642ac2e2b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -4,6 +4,7 @@ #include #include +#include #include "main.h" #include "coex.h" #include "fw.h" @@ -186,31 +187,18 @@ static void rtw8822c_rf_minmax_cmp(struct rtw_dev *rtwdev, s32 value_s32, } } -static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *v1_s32, s32 *v2_s32) +static int rtw8822c_dac_iq_cmp_s32(const void *a, const void *b) { - u32 *v1 = (u32 *)v1_s32; - u32 *v2 = (u32 *)v2_s32; - if (*v1 >= 0x200 && *v2 >= 0x200) { - if (*v1 > *v2) - swap(*v1, *v2); - } else if (*v1 < 0x200 && *v2 < 0x200) { - if (*v1 > *v2) - swap(*v1, *v2); - } else if (*v1 < 0x200 && *v2 >= 0x200) { - swap(*v1, *v2); - } + s32 va = *(const s32 *)a; + s32 vb = *(const s32 *)b; + + return (va > vb) - (va < vb); } static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *iv, s32 *qv) { - u32 i, j; - - for (i = 0; i < DACK_SN_8822C - 1; i++) { - for (j = 0; j < (DACK_SN_8822C - 1 - i) ; j++) { - __rtw8822c_dac_iq_sort(rtwdev, &iv[j], &iv[j + 1]); - __rtw8822c_dac_iq_sort(rtwdev, &qv[j], &qv[j + 1]); - } - } + sort(iv, DACK_SN_8822C, sizeof(s32), rtw8822c_dac_iq_cmp_s32, NULL); + sort(qv, DACK_SN_8822C, sizeof(s32), rtw8822c_dac_iq_cmp_s32, NULL); } static void rtw8822c_dac_iq_offset(struct rtw_dev *rtwdev, s32 *vec_s32, u32 *val) -- 2.55.0