From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 B5E54480DDE for ; Wed, 15 Jul 2026 12:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119845; cv=none; b=NSgJq6aTVMQurXrzay+ts/DvCZMYXU4fBbck70VCI5BEHcvFWE/ZEsnU3KrdiG6gNsbqcdrhl6d6CAoNBjKjCACWhI0tVW7gdCeINUxRisG12rHmhBx8boiUrtqd+VCzzzddMfl9T019lfpraSEYX+gqB1KfwnjKQo51xnVTtNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119845; c=relaxed/simple; bh=cPk5o9xZQlZRpoDRRXFcK94zW/JW9mx4H5C7vF0GpXU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kljk911GCHU63CmpqFaZqaxTzLxB/2heOvXep4SEYRenseZnUVeQmOROBWMdZ0uWpcgUc0qhaVVRYE/s4LehPss/C40WeyZNJ3wDGqd2GOh05Dim4tmTNFF+f2tisQ0mm1wnH7Y7/LiFTFvxKEg9kBaJsfH+m5PcvZEldv91GQk= 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=CubTI8uV; arc=none smtp.client-ip=209.85.167.53 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="CubTI8uV" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760346e87.2 for ; Wed, 15 Jul 2026 05:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119838; x=1784724638; 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=nnEmABn36nReF54sXLFaE23DbbF9DMEhTK4qKYnVCLM=; b=CubTI8uVGmd6yf9qIah5ET2au//r5sHKJxxhkV00THXTQoJub0ClpHv8u6xQSXmx7G oPUDgomIgfJUUnqm4gE0V6vaZr4r/t+TqBt7HP6om74gT+x+VR1wWZjC+vr87pZTMZ7e by9FmI+WEPUCxxOUHB9AJnO8nCYzFF6PXdDGk9fYIhQlXVtPFEOQzMqTr6Jpzkrd87Ix qWz5bXYBrz1HZA6DAa/1tZpuNd4eOSMMbALbKrPE7sKdv77aRFSefA82HjRtCIaWIkMS zLncaqOaqulZNoE5li2h3FWd3kPG9cAa8esUOTh++sik5AFvAmBVIcpC0daWC4CisRHh paQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119838; x=1784724638; 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=nnEmABn36nReF54sXLFaE23DbbF9DMEhTK4qKYnVCLM=; b=knRKNUKXQydKQCtk9cm5VFGdg5NsAqaMxaJ+pSrsWGonvKn4XoObOhatPp9hJxglPc DnlJzgyfZdGgkqCiPwVh9EW4fw948Vq/mHjauqFqiaz19R39MYEBKG/aIKgKiB+UGhqm cbGZlGpj9Rl3te7jG53R9U3GZQTtEnJBOz6/8UXS7GGc+j8wCLLieNgRZ/IhcorbaZD6 cfW9MDIuGWcYX9bgVUZ9Z5DjhRArHqKdjbVNACdMhH/VpyR8LNJlXaQlOk6IoIxkvzwE WWutKgyYGcOI0zOiev7d4H4Js4dA5tEs8AqD1BcwmMYwXiJvRdj8QVGlPJMDU7NalLCe manQ== X-Forwarded-Encrypted: i=1; AHgh+RrZaqy9eLBn6z++xA2c5VTwZMlhTCa8gkX0o9sM++m1YwS6HFUpTUbk4o5pNiXEZrQnMbYuAQxh6sf7tB4=@vger.kernel.org X-Gm-Message-State: AOJu0Yzwdjf+bn6BjiBnojtFu1BttGucZrbQGEMrTn/bn1uyNiXLF8VD y35CAPIO5W2vJjre5Bi02lGcUpZBpj7cAGpU0acPl2RknHxXXZNe69gG X-Gm-Gg: AfdE7cmzoBZsD4iwBNzTpzwcEz1uZ6PZEtXtk925nOPMYCXJ9BTHs16sJtmrHhg/Aee hWtiqzJlxkpu/6hExKmtGcqmiWPzDm+V9qW9y6wgc1CBfpiA+Z6ooeNpB4yn3tGZawWuvER4gvs CBhHuYS0SPQGoXTfDjP9wNaIQN8ASsv+GRprGWAbRmftk9udVBsuPCZWXw3AJI/zzZWbwfDzWWn uEJz5o1lEvbe8atro7xC0A0gfC0pHHJEb6XiAy+9wFEZQLIS2QYBZClheCb9RGkZ5J0wh/qXLZd bHcuV6Yvijzl4LHGkzhKqj4Gycj2I1f0JpQTtvFwsstqYS61zQn9KYWf1I6CbOnc21UEIsZCIcY p8wnOVRYDD5r2K9/ctnRzm13SBxr3utt/Cn80Jx9N9auPZWA3Xd4negOMU54lB77PJS8rDryHTj im6MzSxZCV9kYvVhsOfDFGquP7fxMMzH+GSndO+HTcO6qwE0h9khH8qPs76XbEykhXYb9cobQkQ Z41rLJdZCRCew== X-Received: by 2002:ac2:47ec:0:b0:5b0:15b1:3d4b with SMTP id 2adb3069b0e04-5b1582a34bfmr1173162e87.37.1784119837670; Wed, 15 Jul 2026 05:50:37 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:37 -0700 (PDT) From: Arsenii Pashchenko To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ulijg308@gmail.com Subject: [PATCH 28/61] staging: rtl8723bs: inline single-use _clear_cam_entry helper Date: Wed, 15 Jul 2026 19:47:56 +0700 Message-ID: <20260715124829.90290-29-ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260715124829.90290-1-ulijg308@gmail.com> References: <20260715124829.90290-1-ulijg308@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove the _clear_cam_entry() helper function since it has only a single call site across the driver. Inline its logic directly into the sole invocation site and modernize the array declarations. Replace the verbose 'unsigned char' types with the standard kernel 'u8' type, and swap the explicit hexadecimal zero sequences for clean, fixed-size bounds with zero-initializers ({0}). This eliminates an unnecessary abstraction layer, reduces visual noise, and cleans up the driver's CAM management path. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 13 ++++--------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 053861f29..c85055687 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -423,14 +423,6 @@ void _write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) } } -void _clear_cam_entry(struct adapter *padapter, u8 entry) -{ - unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - unsigned char null_key[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - - _write_cam(padapter, entry, 0, null_sta, null_key); -} - inline void write_cam(struct adapter *adapter, u8 id, u16 ctrl, u8 *mac, u8 *key) { _write_cam(adapter, id, ctrl, mac, key); @@ -439,7 +431,10 @@ inline void write_cam(struct adapter *adapter, u8 id, u16 ctrl, u8 *mac, u8 *key inline void clear_cam_entry(struct adapter *adapter, u8 id) { - _clear_cam_entry(adapter, id); + u8 null_sta[6] = {0}; + u8 null_key[16] = {0}; + + _write_cam(adapter, id, 0, null_sta, null_key); clear_cam_cache(adapter, id); } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index 4b05779f2..2b8df2bdb 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -449,7 +449,6 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval); /* modify HW only */ void _write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key); -void _clear_cam_entry(struct adapter *padapter, u8 entry); /* modify both HW and cache */ void write_cam(struct adapter *padapter, u8 id, u16 ctrl, u8 *mac, u8 *key); -- 2.55.0