From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 D7F7346AF1B for ; Wed, 12 Aug 2026 14:46:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786545975; cv=none; b=i3a8o1Ax4GOW+YY4VkPHMdCZJ5J4SPAprJ0D5JM4pRwX1lk+q1KhqD/uvfBm4btC7FbKyOmR5IDRozLlgdJAgFJMy9pmH6aSCoRNVTDn0B9mlsGs+S4aCNnO/AnJcUgWfsxCUlszB1qpoBHd9f69PLcOIalepwTtA6ayLIt1JgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786545975; c=relaxed/simple; bh=5TXl+7FhJNDRzik5WEtBDUOOLm+EMBxf4N2AmcSdcd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TFdLV3vbQSfRJHXOUMSJkYOzebHxasMl5TPV0WvcOL4LCo5t3ANZYkX9UKXO4AXNEA+T0p04oBgVYKy6WEqGbgBPldj/+f7MeB+1whEgGUGtZ3eutyIACyhjxaq0uN4rs3VCtFPmczlhPTw6bBNABFLBcuZwQC+1K3bcTc/J4ys= 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=C/uxJANa; arc=none smtp.client-ip=209.85.167.46 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="C/uxJANa" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5aeb98460c6so968545e87.2 for ; Wed, 12 Aug 2026 07:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786545972; x=1787150772; 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=C/uxJANa7x30ppSlXWTDWBd2Oug0ygp1CX3CW024WyDNE0vRVe/fuQh5taeoJMZegU PEh4elltdrpbba5seMomqcVkRgZpPhrWTdOdIEJl5AJe2CClimqrYGY6Ow4jKp2ulX3Z CDurUvJT1sjaklCWFVsUY8SEEg4BcbSQkJ3Pahiu6bX7bU4g4oP++vFajP5jyx6QFVJB JDXStZKnJzL8m10JXOwtiMLSr+Hti9/8DyZ2JbFDhPSDbZj9UmbJOFrWn9UBlgX4aWjK 86MGwKGT7MVYFMLxOSqdtj1yDQtZ/KDt0pw/0uPfecfip2K/cBpBeN6ihrgdikqbKQCg P0gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786545972; x=1787150772; 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=IBayx1hQpk7sfAVOF4NxS33dkexgV81BFMVctr//3V2ro0nlKP84VgENEkA6icphjD wretAl27g6pGj0q9C+mx1gPzE+iXcesiwDsYBsjqIxIV4tUR+Lz98lkdKVC6fTbaSkfn PLqfuG7qw0begj9VzturZaeILBrTAXia+4+57JpKynh0xJa8gas9N08BYbQqcwjsxsGE Nv13/1u9pcumRsonhKEKWjWRw8VaAukQ2OGGd7CWz1zfL/N5u3Ob3xqEzzAIbb5nGHyz Q+PoH4m4wOEN+Cxd51AwJQfwNTeF3hWsfXP6OqQSOseido1c3udlsK2nvUpr+ZssXBAy VKpQ== X-Forwarded-Encrypted: i=1; AHgh+Rro3LnLZ44j6ycRtHFPyD+Z5wf0xGKiLKe8VG/iSbnFYAMWUo3gGOQM0SQh1unliq+qSWp96Yd3DCEOkv0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7vI2Q+ZtjFwa/YRMPdZNVPjOKFuVh6GhYdJ7vulUlUFUGt7Eu MrMrHzH5yfaggezFkqzugd9Z4CQGUAAeImfNQe4m/O9p96W29ib3MeGV13S0mT6b X-Gm-Gg: AR+sD11jZ4kgxIpk0fBlOc1PPTCDX2WvjyM/y1KvIWv2j4CgPDLjcPO9z3BtlY8d7nU WvFVOQP0Yxdey0bautAJv/asFNl6YcMmfUoIJ6gua6jcBrFpoGkO2dNGMkKL+z29twE36EuKicX cydbUelcuUyfoLH4qqDvJicqmMLbgX/kOnScPYshBXJm1NaLZDI5wGxEy/kPmogWOutc9jr/5mW pTBNm5eOuNlmdLEEf0+440Uv4yrUSztAOPVpyKusG06LlXzZuzx44Im1RYamCtKa58jsOrZAfLS yn5bssevETg+La3YNhzGUblJ65dWy4cH0XKdbieEg6JFYWi81yar784I+9EbvKr7pFcwzt5jlBn rdf2rta32WD8eV3Ob6fDBSG1gq4EGFWhhio7rPDGjNEdIXNXuBaa8JbEuxP1QOA6fFFrogUWNdV QEZPHPeRQUIt9G41rYQyMgs6DpwQpVwNHi7B2ZzpJungyZmn/V3ZQftqwbN/LhNzRlBOeEpGb/j AmBRytVSooljzI8zCbMAAEW5lA9HVhiSf/AT37zXT1JSmYJVyd5ZduYxO1Eyg== X-Received: by 2002:a05:6512:3b91:b0:5b0:1108:c57d with SMTP id 2adb3069b0e04-5b44e31cef8mr947204e87.46.1786545971733; Wed, 12 Aug 2026 07:46:11 -0700 (PDT) Received: from archlinux ([94.180.96.85]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b44cfc27besm552179e87.21.2026.08.12.07.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 07:46:11 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH 3/4] wifi: rtw88: rtw8822c: switch to the kernel's sort() library Date: Wed, 12 Aug 2026 21:45:45 +0700 Message-ID: <4a0b85003aac26b23fcfc6e414e00b39e0d2aa45.1786545572.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