From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 A52C242EED6 for ; Thu, 13 Aug 2026 06:52:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786603974; cv=none; b=oMe6ZkPe0fWqkSCENzz7mlgcKyTxx8tbgxZ0l+S0hCmOB9lvHNKS+kBtD1rJB7atufQvqxGWfHsKggBomJko5EFguPHE4KF5d5JE0ADEeC69zsaaU230gma/1NwEXgYMe2XUEtybWdNiK4Hukcq5hRbXw3TbOVG6FwMUZK/HrW8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786603974; c=relaxed/simple; bh=5TXl+7FhJNDRzik5WEtBDUOOLm+EMBxf4N2AmcSdcd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N/gbRSC4eacaxZFFvHvPHtsK4W5DsGH/zGCv5arUtF7i+/POQOXErCXvM+j1+2aGTBbKjXJXZfvyv8HNl3E4XDqGwZs8m/tK9HWRoQLxo0edZFgYWAlhMznQJXrtgP4VxzvVoEveNYsWBBm6cy94LChoMVbalSmO2qCHHRh+eaQ= 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=NINENh83; arc=none smtp.client-ip=209.85.167.45 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="NINENh83" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso2221218e87.1 for ; Wed, 12 Aug 2026 23:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786603970; x=1787208770; 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=NINENh83K9ldqARdayB4yFqJzgtD6hSUTS2rjaIw8C/8eYzgCgTuVULzteosB3ISCk hoYVGuXoGdihgOS9c8DnzwTaDc8FyfMdHqlEXIdn1ta7dpxKTXFSRlrC110XRvVmOTIT 5Mbj964tjaFIJebflupGClhTY9Eaz75vPGWrfQMTaBNaTMw6QvlDi5M8tQ+eSK2S88PL 0mnwohLeOGHK+T/mGYtYIw7mVAytmlEMh500yEDBZaTTEZQczcoVDbKZ2mft9S5w+iNz yqVLaQJrqnnd0cmJaTxPoy4mR/H3QrUYG5Ny7z0DE9cDYIyMinM0khS+fuijwkcF7AKP r/5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786603970; x=1787208770; 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=iE7P4p3FtIX+HYYiV9WdfxfkolOHRgRNNAc/yQmQ5XRNwKItIJw6M9p8fBcQciIlXO zhkM92FrHI7LzN9dsf1sORFug+DmzoZews5+AqhiM9VR3oy4BtZeEBL0M6ZhP77Ux/iu VOZU6n4yl6R/0g8oe6dYL4bmvJ8SbhgWjgjQDtnPN6xgtFnz08fLuMmK3qnOnfU0KkUh iuqmf61GIewQdOzY9xbf13/CVqA3A2uNvzNYZ2FMg1cLvKsOy9Vm2+ufWsgM3320QNHk MqaCf86skfYrvE5tanj9QBiY2Ku0vzrq21qmvCuxXIuSnWFUX3+gBYh7KX7qq+lOBFQz ZiIQ== X-Forwarded-Encrypted: i=1; AHgh+RoSEZJLofxppMWyswkBwHV/YLYMFEb6ldfYhnKAUpVwO2YNeHf+XALIJxBHlV8ZIIAfY8a9wNf16Br0nBA=@vger.kernel.org X-Gm-Message-State: AOJu0YysXZJFsn1MlOWHQKc2/pXMpaEx3dVWWmS2MDcDVTUGA+ohhy1p LUHA9EENNHBoDhIAaaZoTKcky+YcQBDO2ZtEIpalTZ1wdTivTOInAbqa X-Gm-Gg: AR+sD106l/KHvLMoa3hw/6Q+2ZBd+Mx3+4PK+wBsgtvyOSaKQedTs8iBGwRj4ejNTqI b0x2ZDV4iJILR5Kho/Vf2GAl/GZ5p4hl8sOewOjZ25RSYSYtxXGCKQ1n+2IxD49H58Clk+jzrLx Zvkxusi0W8f4yFnlE9uVMlO5rkTTyPtd9aIemzNXJahyBY8icT+apaOWBj9y9hxzFuegun6FQt0 61jGOwNwIFvGahbUX5TUhnmXV45IPEEJ0SfzNd+1XB4Jd0B0qh6WW6J4PGHXXQKLfFMMyWO7wzZ m1UTcsi1s/YZ5BRm2NHGRuxWP0O+stPJfuI5Byc6M/ZWNmA6+LFSEDiQa1j6jn0XFvmymxorH3H DZUrvG39WsDfmECrVKnoNbeO/M+rE3HgqglNz9Nw2m83GymcwYlWsru6Z8dqegDaNNjS9hgawnn mm7WKsYLwTDIoed5cL1+/jYiox63KantXxg7FVOnm5dQ6tW6ktDlkwuMudAK6S9sIZc+fggrlI4 ci/sPOHI+H/fbXOHVayz30mCQcs3w0YY/YlqoIpLU07wTsYbEL+tNSaUi6r8g== X-Received: by 2002:ac2:44b4:0:b0:5b2:1dde:ab15 with SMTP id 2adb3069b0e04-5b453f96774mr294826e87.55.1786603970516; Wed, 12 Aug 2026 23:52:50 -0700 (PDT) Received: from archlinux ([94.180.96.85]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b453a54adasm270076e87.38.2026.08.12.23.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 23:52:50 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH rtw-next v3 3/4] wifi: rtw88: rtw8822c: switch to the kernel's sort() library Date: Thu, 13 Aug 2026 13:52:34 +0700 Message-ID: <4a0b85003aac26b23fcfc6e414e00b39e0d2aa45.1786603749.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