From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 CC5F11FDFB4 for ; Tue, 5 Nov 2024 05:55:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786131; cv=none; b=TVeNDGal0Kg8lmYuwQeq8wz2/VAxIFaqNwqbQydRPteBzicZpuMqgfeUDZ34txwaxAz/oZltCUzlL8jVE5dA3ZJEi559L85O+W8kMQu9cUGFtyrHU0afOrg8VDP/99F5h6FWOX3kU5kOOBWRCYOzScQGgzKMLlWbW9dUceidw6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786131; c=relaxed/simple; bh=e0qpNxPiS6knu42pKMhzUMqgsBTZxSaiUf7bg+iHlrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NriEI09vgB4j+NuEmvl94ey7yPsHaylotN1vEwjNx64ZYop9WVGIGZ1Elz0ckC445xKnxB0YkoejP27FnSGHgJgRHwlMCpxAC6zrR0SqhOBUDh4KxdTS4xSqYtIRqOA+rJP92qNkGOF3/y7J8vYQ9Y8S+mtOu4xM9DDYnuW0Nd4= 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=UujOq/lZ; arc=none smtp.client-ip=209.85.218.44 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="UujOq/lZ" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a99ebb390a5so1088805666b.1 for ; Mon, 04 Nov 2024 21:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786128; x=1731390928; 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; bh=/ySr93uDv1RLoNp9SZC+4GP4tsUzCUfN27zMA1PYid8=; b=UujOq/lZ9YBv+tmnJiHTSXnyIq0hkxjGiOfgWkFMGvqBCmnbCpL8hjohGg8D9ujMaH TnA+pafAm7UNDkd/M25gKw+JRh1nB3kQvJSyfZ4/dCx99xZhbayY10jvujQP9H6GwdxQ 5TgTMo6NvtKzg5dTgvt/g/ifCokYkED7+ZXYjUmgUAyKVb5UmITX9kU91LEReJ9Ufb1/ lkK3o9otBFGGYbc34FZMXYyy7Tu/1VwyCrKMJmpIu215toC1nDewrCIKjjXzvXgb3bQk Wj2VE2JxFoxUn/wARLu4Rz1z2OKWhIa+vJCbS8sQAZGZii2IPfHZSP4DCEgdPzoy87eT 3pcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786128; x=1731390928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ySr93uDv1RLoNp9SZC+4GP4tsUzCUfN27zMA1PYid8=; b=AKC/08T2rHLglJ6XLZrSIx0JrBN+7pvSF4ASfRqy3YRyh9piVbRDYW/JDfBbqcHACl on9xnSzVSPDTRi5LEhQIFf8L8l/ZAM+EO2leFMWW2TmPnf22a4wq4j6WhLqKBO/8sqrs 5rWGQnsHm1g2APqYYX5FENJ4Uhw/fzUafOM43Z9F9RBg3PmuIidJrEdNk0EMtlxjD4Jo hinee1jPfuq+3IJ4STS37CsvqnffKKKG1NYnuUUQxsTUCAAEhNJeuZLL8Dx7VLaZTUCH H6PTcDasiVBE7RUYF5G/fBZTYxtsEubmQI8JG5HxQckWvVHFGXqZY9zGL4HaDS7V82nX bHOw== X-Forwarded-Encrypted: i=1; AJvYcCW4+8cJzd/nv3iazj4WQJCDt0GzgSvSzDR7k8Z+94MNyLJfDwX8DuhObrknU5+DXTXpauxEtoERu/pMivU=@vger.kernel.org X-Gm-Message-State: AOJu0YxOlOoI5XTsl0FcDWn1pt65e/m7aN5hz9THJBBZxa5+9uBVD8t7 1AC/mrcvXO4eNh9K7ZuADW+XlN4GWNm51v/AX7XrpNtIIoDjtqgo8K8G9A== X-Google-Smtp-Source: AGHT+IHS/vo13xfu+Zu7dmKKO4/v67IudTcp/WEOqVMqzf/cmcc0e7FEoRz2vRabvCkIqUleteR5Pg== X-Received: by 2002:a17:906:c38d:b0:a9e:82d2:3266 with SMTP id a640c23a62f3a-a9e82d23c2dmr780516966b.4.1730786127936; Mon, 04 Nov 2024 21:55:27 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:27 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 01/16] staging: rtl8723bs: Remove function pointer UpdateRAMaskHandler Date: Tue, 5 Nov 2024 06:54:48 +0100 Message-ID: <6e11b767faf44c2e95a05f3e1326d9cc382dcebd.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer UpdateRAMaskHandler and use UpdateHalRAMask8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 8b924961789e..397fd8fb3cb0 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -221,8 +221,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 r= ssi_level) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) add_RATid(padapter, psta, rssi_level); else { - if (padapter->HalFunc.UpdateRAMaskHandler) - padapter->HalFunc.UpdateRAMaskHandler(padapter, psta->mac_id, rssi_leve= l); + UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level); } } =20 diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index c3fcadc634f9..20c8459cd6d2 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1704,7 +1704,7 @@ static void hal_notch_filter_8723b(struct adapter *ad= apter, bool enable) rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) &= ~BIT1); } =20 -static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 = rssi_level) +void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel) { u32 mask, rate_bitmap; u8 shortGIrate =3D false; @@ -1744,8 +1744,6 @@ static void UpdateHalRAMask8723B(struct adapter *pada= pter, u32 mac_id, u8 rssi_l =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->UpdateRAMaskHandler =3D &UpdateHalRAMask8723B; - pHalFunc->set_channel_handler =3D &PHY_SwChnl8723B; pHalFunc->set_chnl_bw_handler =3D &PHY_SetSwChnlBWMode8723B; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 7050520224ff..e882877436c4 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -172,7 +172,6 @@ struct hal_ops { =20 void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi= _level); void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); =20 void (*Add_RateATid)(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rs= si_level); @@ -308,4 +307,5 @@ void GetHwReg8723BS(struct adapter *padapter, u8 variab= le, u8 *val); void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len); u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); +void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); #endif /* __HAL_INTF_H__ */ --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 182681FE103 for ; Tue, 5 Nov 2024 05:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; cv=none; b=L/Ro9n67DuS6ZkXkjX5oNM0umnaSVKVjFoVSMvSG8OY0AyNo9xCW3ml+GePxTGO3EAjtI8kFCFoDr1YbQC3Gcdrg3/47m+whXyK5oVOoxJHqHhyyVCnv3CY+gTOE6jegL9yYxLWgd64mTOxfxGdx4DHhlxEYOVjlpnpqM2KIm1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; c=relaxed/simple; bh=6XQX9Sx9O8QzEK8Jv5n+XhTDT5cZkdFl3LWcOJ7R3do=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QYjoU6mQjD3dALtWBQ0xC/oGk27VxkKeybuSygjem7hhAfEZUWi3YyDgMGqIgHzl0yD9JimCp705ao0MCXB5haU1Fag1jye+/XAsYi4U7wIRE22+J4LdpmH6HVGFtK4GebOANzoRY6RBrjU8MBGlcOk1mESqzCKuhvyUikn8CC4= 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=WDUfXjGq; arc=none smtp.client-ip=209.85.218.41 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="WDUfXjGq" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a9a0ec0a94fso812488266b.1 for ; Mon, 04 Nov 2024 21:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786130; x=1731390930; 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; bh=g0RiCycJ8lXHIHnZIr/OA9nJnBnXFkGlTbDFIlYLTM8=; b=WDUfXjGqFJDWGE6iB5JyGAqN/gafQAeHfo7qJDTQKijH0ja75GM5ny249uzryIe/7p fVXZSpE/n/yV64ygY5nvPFv/1kdd8W+OveotrYFZ8fxzl4yTJqdruXdGoLlYygxpJPlu nqGANT5vBXfIwCYIsIvFASGYjQ3CYsj7s/97V83HVdpQrc2FtcR0R3FdescDNkkfKl1Q P0vSfbGbMilujV6vIXGoQm2WnhOEDCtDaaML8yLDx8yIYZ5qeNveqZDgWrhkrH2kBhgi 3173A4x0l9s2ycO0Tfx0it4ikp8LaZtZjXYceZSALrfyxz+NocPhUSOfq2rhrCMd8Qdz NgIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786130; x=1731390930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g0RiCycJ8lXHIHnZIr/OA9nJnBnXFkGlTbDFIlYLTM8=; b=iFCabHH/kyq20c6PRlypUG6WEOfa1BxVXHmmFFtrv3rU8QL0QX1AnjAylxemWHj5VE HCbxVGSqhqx6K05rgkNqO4Ms3WtYtyyhy1U3l9GFbGpWfNuCLgIiNw+7DGxw6InBgY2Y YVUEtisFTqZ/FrpDg2eI+nlEUYAFNHQKR3uWNOH6MjOhKgV9rr6WLU7UZhvY5CXVbIib itZPfJoo5Eyt/nZk1HHgunzoxm5eHRMclvsosPmKYUjlXktWP0ZHtR92QTeqvsk9IOYb 22a3anjTt0mugyAEQIMmr0YZqti9bzodDd3IIaf7hDFPeKqjRp3bxGZjO5iZ3CATiLDM of9Q== X-Forwarded-Encrypted: i=1; AJvYcCVoBUCmXFT9sb8EWctfCNHx8MOoK4/nbWcn5mCBvNdNuVE6fQt+6QywYCFNvbXtgK/Aqc7royFxpOZwn6Y=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq1qmmERvTDehjNxPbqtMAmeRd/hVCfo84zaMieH9TmoNUi7Cc WGIHC7Cd4/VBixK0pHrBQsuQPkZXGOGKrUWVeHqBL1HY1Timxl88+ZGEJA== X-Google-Smtp-Source: AGHT+IF+WdaU4acMcLDkkvrn0a+HllwkOyKrrBr64zT41an7zVt18JWmHU3XpQmoxtYI6RY6OSzjOA== X-Received: by 2002:a17:907:7da3:b0:a8d:6648:813f with SMTP id a640c23a62f3a-a9de5d6ed87mr3251989966b.3.1730786128533; Mon, 04 Nov 2024 21:55:28 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:28 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 02/16] staging: rtl8723bs: Remove function pointer set_channel_handler Date: Tue, 5 Nov 2024 06:54:49 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer set_channel_handler and use PHY_SwChnl8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 397fd8fb3cb0..aaadd56b7d8a 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -274,8 +274,7 @@ void rtw_hal_write_rfreg(struct adapter *padapter, u32 = eRFPath, u32 RegAddr, u32 =20 void rtw_hal_set_chan(struct adapter *padapter, u8 channel) { - if (padapter->HalFunc.set_channel_handler) - padapter->HalFunc.set_channel_handler(padapter, channel); + PHY_SwChnl8723B(padapter, channel); } =20 void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel, diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 20c8459cd6d2..615a33cad84a 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->set_channel_handler =3D &PHY_SwChnl8723B; pHalFunc->set_chnl_bw_handler =3D &PHY_SetSwChnlBWMode8723B; =20 pHalFunc->set_tx_power_level_handler =3D &PHY_SetTxPowerLevel8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index e882877436c4..9e6414319608 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,7 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); =20 struct hal_ops { - void (*set_channel_handler)(struct adapter *padapter, u8 channel); void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum ch= annel_width Bandwidth, u8 Offset40, u8 Offset80); =20 void (*set_tx_power_level_handler)(struct adapter *padapter, u8 channel); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 920BA1FE0F2 for ; Tue, 5 Nov 2024 05:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786133; cv=none; b=lkFgXBzp+vH0yxKPVFd4SIB6EYwV5N8qs0viNCtZOyeDKv+UzA70xRddg7zTIAOnW38GX+M6DCeI8NTZKmX5qO8vkckHYjYFu3HqUn6FdmNvfT5gOBm3E4dbXl984XwWWbb1nPKz40bvH7hY/nWfcv2r82UM9rabzd4ZIQPZMgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786133; c=relaxed/simple; bh=jrq4/E5NDDOpFNWHL0DN5PzOqvNMgQj/oKYq0prtfR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IV9aphAhnQRdUN36OxWpy3r1sbhU9WYoTeE4aRuCHyRNDvIaWKhvNOn3quQ16+Vmm//6JCDowLzzsugYoCXkHkWMgoUKRucCfmxeq6rIa0eH7H+qA8PTA6irzEFkAJsP+nQqHJVmkp1YhAGlYQpHf5vRr7opnxAovmqv8TWtbEc= 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=SmsgVlEo; arc=none smtp.client-ip=209.85.208.174 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="SmsgVlEo" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2fb5fa911aaso74555501fa.2 for ; Mon, 04 Nov 2024 21:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786129; x=1731390929; 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; bh=tPl2wir3DMIoXyEGtK2BWBXAxfA9J6lkO9SyjSLT3tM=; b=SmsgVlEoE3yh+upBZ3sTeokLcwS4iJG/m0j+g6DzufSSeNabOw+5fUGFBclnoWmxeU h7QGY2lIRGXSj/I/+B0KGxkoh+VaJ9Pw5WLbgP/N0vYzyVq4Ah1OZ0Djwpf0oEfaBcKL H2wLBeF76EMPbjkkvaOL61dsgb+ezV2+uhxNWId5M2gFidIeLB8nabYJCwCYx4uK9Wm5 6QZexCpIsnEdJKnbD1OB5MHvBp/13QmR4lF9+9Rbl//w54gxLcrg6Id2eQKQYlU+Eekq Km5SX6D+Mw9jBeoDnckFtkxTyrK6DQKjRFtkxG6zaGyzqn1CFcNP9NEvv/0MVFUGfvWq sUHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786129; x=1731390929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tPl2wir3DMIoXyEGtK2BWBXAxfA9J6lkO9SyjSLT3tM=; b=ixam6MzxnLnbRAbpHl3L17kHdL4KNMLHXsGSydXlPEbYFr+qvqKnuTFT+QUzJVfspX ++KXWYO3xX9P9jC9fT9hnOT+IhE85zBugA0z1FK9ig6KNJfoATKsHfkjKtjIi8S69DsW 0atFIgM4YFLCGKiTCL6Kz8xFITdjgRkCuMX+/N6nFHZ0auojmNxzIYmwgWDe4Da8OzAR kbyTldbhSXZCLAnOpmQ0D+w7Y2hczw6L53ZinAbh0NgDoleb2aGaYgOTR+xFrAuLbK1/ kFUfcUPWGHihPpUJGL7jNjyc4oP+VNoahbszVktzGLEpqOSWu5p1une/jF+rkrs+uAFd tj7A== X-Forwarded-Encrypted: i=1; AJvYcCVUzzPFqFd/On0g86QDD8vXWyRBhKOKZqn0ZSVHDP/c15nLDfVxw9ShQz5/R3BhRub9pTOWWfoMkAy6Rpk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywt7XG+bx3zsT8yv90JwsuWhSCUinsa1rMse5y6s5Q5jm86fFgx zKUb9yuTqI6WFw/k2z2gF8Ww4xXZsBs1H4H0uiPVzYIBpYnPb00b X-Google-Smtp-Source: AGHT+IHM26YoJDPjOfCd9kEU5QTvBz7nznuCJTdiiXg9j76bfiW0cudiQAlZV2koGeLDcxMzKmAHQw== X-Received: by 2002:a2e:a589:0:b0:2fb:3df8:6a8c with SMTP id 38308e7fff4ca-2fedb7c9c38mr100205051fa.23.1730786129140; Mon, 04 Nov 2024 21:55:29 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:28 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 03/16] staging: rtl8723bs: Remove function pointer set_chnl_bw_handler Date: Tue, 5 Nov 2024 06:54:50 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer set_chnl_bw_handler and use PHY_SetSwChnlBWMode8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index aaadd56b7d8a..7aa9d84ee574 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -280,10 +280,7 @@ void rtw_hal_set_chan(struct adapter *padapter, u8 cha= nnel) void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel, enum channel_width Bandwidth, u8 Offset40, u8 Offset80) { - if (padapter->HalFunc.set_chnl_bw_handler) - padapter->HalFunc.set_chnl_bw_handler(padapter, channel, - Bandwidth, Offset40, - Offset80); + PHY_SetSwChnlBWMode8723B(padapter, channel, Bandwidth, Offset40, Offset80= ); } =20 void rtw_hal_dm_watchdog(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 615a33cad84a..283208e1de5d 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->set_chnl_bw_handler =3D &PHY_SetSwChnlBWMode8723B; - pHalFunc->set_tx_power_level_handler =3D &PHY_SetTxPowerLevel8723B; =20 pHalFunc->hal_dm_watchdog =3D &rtl8723b_HalDmWatchDog; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 9e6414319608..2b3eaabf0774 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,8 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); =20 struct hal_ops { - void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum ch= annel_width Bandwidth, u8 Offset40, u8 Offset80); - void (*set_tx_power_level_handler)(struct adapter *padapter, u8 channel); =20 void (*hal_dm_watchdog)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.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 9D8631FE0F9 for ; Tue, 5 Nov 2024 05:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786133; cv=none; b=PLij6DXIu904R4p8p90rtTy9Q36QnsuAulXgUVvLu+GZ/UWPj/D6sqAMhBEzQ5W8k2f+dMiBpX+JhE5vBixlnv7jMaox1OL9nx9p5twhGdQgC54EWIIJNLuQaowsH8I+DUbMseoe9a4pHRkqWxc1Y23V8F1wcWzao+w9voAuZ8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786133; c=relaxed/simple; bh=iZIgD4kf+Ww1++LYU44CC20JiDSdN10U4Ssr9cbPSMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IlqGm+YmsCXuTw3OOKmVriTb5Aj3KaXSkmDN3yr2wKyLY49Zy3qz8Ldi49MF413oH/a/49WO7npYU6Ti7Ng4TFaS+gMRl65nSrbz07DzByQx440lLjqL5y6V4fbq3JavuhhTY+HKIanzmjTjMlpPnU+7vGdJfkOcChdRkf7VZo8= 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=W65A0xJU; arc=none smtp.client-ip=209.85.208.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="W65A0xJU" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5c957d8bce2so2568547a12.2 for ; Mon, 04 Nov 2024 21:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786130; x=1731390930; 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; bh=x6DCAV762f4pW99ALqAJAaS4UQZ7p3HFWxh9RdFODKg=; b=W65A0xJUo+pezcmcaqn+RHeE7MDgAoMo9vv8KVEtp3hYUxK8fncJO4WyaBI24Jm4ev TeNqKE0roHQwFkdTyZeGwC6IjGCZm2C44v0JJSdl/i9MdkxQfvCWmQ9pNd8BqFobdMj+ HKzFHgHZiMI+Hiv3bRtQf2G2QDTXu+Me1mkVJY1ZK4lEM2SFszVlUIBXGAmzYTNCJJI7 c9KC2wpp3aCGdy+UjBcjg8ZCZ3Ks+ozth6EXnRY0S5b6wzg+hBDoLNxWUoeoYM46x9Kw Mks7SMhXBO2Nl7Oj3jXkBmnCnQn5oFeCS+/ZWbqcDc2+RfiA7RlYLhnNp4X62T0aaPlI aE8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786130; x=1731390930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x6DCAV762f4pW99ALqAJAaS4UQZ7p3HFWxh9RdFODKg=; b=J6NFcjQ4Sj0FUILkVlp2c+8nLC3Ukig/Ks1kXcBj4JEc0yqnNTSq0m7W7ABlWZxBcn cVIjgj0It5WOlh7b9NSkHB/CJVsaebVeeF19byCgnGFmomeYjDs7AyQUm04vlvqVMH/r cAWq3N5T/w67/SlqruUeEIkWgMKXru6vgjQsORott/faWfUqBoQ/aFKkGrbBGLrQfjcM /NYANqumu9xf2eABaCbeiIFHKpmrBXbtxxOKtPgEd7gfz0jehsBm6W7DLAgOpvpI2gff l5GA6iZMVjIA0ovUzUEhc1RbnWELhp8YD64WJpi5dztRAqRvqyhR+dAKKD3vymgVqw1V 79Iw== X-Forwarded-Encrypted: i=1; AJvYcCVMmQ/jwfGHV8AbOVVb/A1ckSH3X1fetBsNyJYep45xMfv70H5cpbrGT1y6+CTO6QbJnM0IO09MzwlPo3w=@vger.kernel.org X-Gm-Message-State: AOJu0YxiHZmSvuaQ4Fjngq24WcuOZRuithhx4Vr7lFOdqG05Ni0nNy3U wjvKA4S1BXR3X98gjLLTDXvZj7mSUqr9G/YUEvmWfDpZyYlVg/1H X-Google-Smtp-Source: AGHT+IH/YeS/+k+7hcyK/7k8TRLFjq3T5fB/gu7B9YmbPIExkIN5JfU8g+Hyym43UCBxdmN4QRemiA== X-Received: by 2002:a05:6402:1ed1:b0:5ce:df98:c080 with SMTP id 4fb4d7f45d1cf-5cedf98c179mr3143428a12.3.1730786129739; Mon, 04 Nov 2024 21:55:29 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:29 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 04/16] staging: rtl8723bs: Remove function pointer set_tx_power_level_handler Date: Tue, 5 Nov 2024 06:54:51 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer set_tx_power_level_handler as it is not in use. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 283208e1de5d..f742a82d1e35 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->set_tx_power_level_handler =3D &PHY_SetTxPowerLevel8723B; - pHalFunc->hal_dm_watchdog =3D &rtl8723b_HalDmWatchDog; pHalFunc->hal_dm_watchdog_in_lps =3D &rtl8723b_HalDmWatchDog_in_LPS; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 2b3eaabf0774..ddc4c41605d2 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,8 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); =20 struct hal_ops { - void (*set_tx_power_level_handler)(struct adapter *padapter, u8 channel); - void (*hal_dm_watchdog)(struct adapter *padapter); void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); =20 --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 832881FE10F for ; Tue, 5 Nov 2024 05:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; cv=none; b=YJeulqTYDY3VWYul7WR66ZJ+F9+Tntv5Vumf3hwNqL8KkJhqW+Xe/+7dP89bw9uaMwkOLcG20hlkgtVVJBp5DlrOXzTvjd02XZ2AFGeX/F8POuwMLiyEPvKQqHLDT4iL9mEvJ2w1jcz8MdUfqXzhHIG5gJLmwvQ8VebBoa+ig/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; c=relaxed/simple; bh=dUmRw66INNlKdlmTudq7RiF3F29a8TpZ7rdCqwq7m+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lLOvN41EUO7DWqT4IJO8rslw0az8Z4MKmSvB+xk5TFqnVVXLYEycC2CpM9KkfxAojdJxzItWfx+uSRx0aqF4YvQWd9gFbN8p47a6505+RsFEF08jeNVNDAw3Se3fQm+lf7dYsNNb+bJyxtcfx8ohti2+PclmAVmUKWT9UTpee4A= 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/LyptDr; arc=none smtp.client-ip=209.85.167.44 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/LyptDr" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-539f58c68c5so9084315e87.3 for ; Mon, 04 Nov 2024 21:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786130; x=1731390930; 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; bh=ATcCt5wGapgsOIibXTkxr5INcEzs+wUBJpSP0wgkVe8=; b=C/LyptDr5mVB1OZzLDpd0/T01gMjCXfPqSiI088jpYhAnvg+uPD77OIvUmEEHDWmks gac/1rwlyASuweWYDtKKoNObaVBEfVKZLc2NWKsGeKLlPLqcfE9/BHADTqHZ132GbFlX dHTlDDjnJEC03/q6AxjCSzjcENRBSlSa4MBJ2h5wLMotYZOblY11d0cr4uGWIxun1SzX a40/7XzJF07uzb8tqTFPvSy+p7PH+Rteu5g+wc0mR0QpCXNdBAqCfIjPTWQx9JMC86g7 uTnbEaYyma91beDsCfBs+OUNkaOnc2H+KH6rnWph+xSbF0J6Scga7YBjqxXqrlHapely Da6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786130; x=1731390930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ATcCt5wGapgsOIibXTkxr5INcEzs+wUBJpSP0wgkVe8=; b=eC07kRY6F+3tq9ztxNb77a7dsc/HEmQQDf11P0ser+dwn3mzixNHQNrq0vZ2kpsd9E J9jwiZmHc2v5aMhbbx+B4+OJumuMgoaCYwGHM9zasSGJuz4D/6Ywv4JIEvKPIuuEhTd9 KOKwkKoLy3OOze69vbNrT1RL2sRwzZEDY4lIgh7EEW92fCCuElTxu3XvRAbujP6avEEm 8sFN8Qr8A60n6j74msYo6TyXE65C7RzSVEDAAK6yILIqHLuGkzLHHbhqky+TJgyEafCW d7KWEBV6jCfENLiJ0jtPX88ZG+FPTWYb7ckE6ob2nVnPDN2yQ7JGyMzg2XvjK261k4wJ VfmQ== X-Forwarded-Encrypted: i=1; AJvYcCXU1bH+PRa5aL2P5Drf9ZUKd2O/riB44QjX7bx46O1S5bhM7E6jULtkj6kW3Rrou/f1SwzKxaJnDP6eHPk=@vger.kernel.org X-Gm-Message-State: AOJu0YwBxW3pySmFT+Ep29xW460T5GMEpuAtuO0RTA3OYUA1Xmwv33qF JIOKlKG0qf1JFDcUKBbUexbqhlqnGQff5KDGjuWdbsN1CZofydT9 X-Google-Smtp-Source: AGHT+IFf7/arJetSzLOR2v1y+NSDgZwOhl+cpQCCz/tzyY+aP5gGIynapqUT0FiOj0c1zKHOFHDl1g== X-Received: by 2002:a05:6512:b12:b0:52c:e17c:cd7b with SMTP id 2adb3069b0e04-53d65de52aemr11843291e87.22.1730786130334; Mon, 04 Nov 2024 21:55:30 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:30 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 05/16] staging: rtl8723bs: Remove function pointer hal_dm_watchdog Date: Tue, 5 Nov 2024 06:54:52 +0100 Message-ID: <6e1b09e7d7184285fc747be7d7bd636bd1690d60.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer hal_dm_watchdog and use rtl8723b_HalDmWatchDog directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 7aa9d84ee574..af72e0fe6fc0 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -285,8 +285,7 @@ void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 c= hannel, =20 void rtw_hal_dm_watchdog(struct adapter *padapter) { - if (padapter->HalFunc.hal_dm_watchdog) - padapter->HalFunc.hal_dm_watchdog(padapter); + rtl8723b_HalDmWatchDog(padapter); } =20 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index f742a82d1e35..ff899a066b33 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->hal_dm_watchdog =3D &rtl8723b_HalDmWatchDog; pHalFunc->hal_dm_watchdog_in_lps =3D &rtl8723b_HalDmWatchDog_in_LPS; =20 =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index ddc4c41605d2..311a97c31518 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,7 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); =20 struct hal_ops { - void (*hal_dm_watchdog)(struct adapter *padapter); void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); =20 void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 C00181FE117 for ; Tue, 5 Nov 2024 05:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; cv=none; b=bObd6VzsVlMnhSYopRWEVv9J+eFGmntvrGJp8E81uawqWgaUV1NvznDP6kmK+ntTc67OEVNglWN43w0yo8LbUuiqYQHatDbRTxu1zNr2C4trtk20siAoysBionFvmvC8X2MA8oZFyyOc0nZgo2HqiSBoxY5Lf9H2zIqlyKph5XE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; c=relaxed/simple; bh=5ubW2P8nj31L3YwYGLfQkrwdfjsuU/5UNoEnXJk5TcY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CQ1ILAle8h9yLX/V1V63aS0s3B2DB0pFC4vBvpPZbyYKqHIu93Q4qwtEwoAEbrKI8O05Fva76mzyee2xv7VpxR55xKezcnPRv2K7fko7dFt64oD9MxE/FLYDsn8Z5J2t1BwPxKFMLwftAOA0aEW8CWRUpYfN4GkSGzu97dQ6ipg= 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=FGAl1u9N; arc=none smtp.client-ip=209.85.218.47 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="FGAl1u9N" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a9acafdb745so867523466b.0 for ; Mon, 04 Nov 2024 21:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786131; x=1731390931; 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; bh=GVw8pc8RwLb6Pyd+jaXfJi+tviZifucpMgcZ8jtEoBw=; b=FGAl1u9NAZXsIQ6TgjAX8qv6mg6V3ugicLKp466T92/0c6WF8h5MiYv9ZqBzf0+SlD 0EH6//faUlicr1k5R+L3Foa65hR1MrRfmKFbjvSlftIRBB6/Uf4O1Htbq5D5oUQ6VqUQ Kkbyx/UINSK3d1J4AdhO0nVDktSqLp/HSRZYJOpNmmlxLSZ0tVJAdOADc7hIZR+sAsRr xPk1lpRcVKlXWLa+W99Yrm9+r9AaWPWRYrX6YP2WfJkeVqcnKVbN+nphip9J/9Rjq52f jAZTYdSz1qDyUrgbkMj+3iyATyIgVad6Apt0WbBMeUXUGMNLzyPMfEF2hUG4R+f6LQfK 8+ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786131; x=1731390931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GVw8pc8RwLb6Pyd+jaXfJi+tviZifucpMgcZ8jtEoBw=; b=GehRN4sCWx/SECw+CPI/HzuJkFOc3nAXMvTofoKl1KSjyYsYxRIGu+ElB3bJXjy60l Dc5jka8krvVi/qMFx5JV6Rg4KcKbQDm9t5pks8g98x48EEhnN/w0AfQzhXKFj+XrWe+b lx0jZyjECEmboW4Ju00oOulRTTgtsiuUQmgzbDJeKKzxQ6yigJYJSxZ9zvRzKY/4k9fK SmS96Su1EGllz3EkQytzEFrfDwQU3uyEn42XKbPuIFIX5oGMJzfh1nazMFAJalWni8SN Fej+vIKg44UOvK1OisTcA4hC2fRbOOQ2Ny84bAtQxAi+jO3HrW8N5lmh3Mt2bITCM6za ddng== X-Forwarded-Encrypted: i=1; AJvYcCWl1SxHKDvilKd8gWnehtS/1kMJQA5F6HH8wz1dbBM6iNfAGynZeLLhX2PSL8MTCfbfjcaGbnH35aF2T/U=@vger.kernel.org X-Gm-Message-State: AOJu0Yyerc+OI9G9t8zZQxlPoxpzY/GmOEvYnRigLCmzPNCmZ/RYP3li 1wZJg+ldtq2hk9MyGf+4uqjdvL/Abul7UkmSRn94Y6oU+sOyu0GY X-Google-Smtp-Source: AGHT+IG8V8sNLLQdRs5cgx9f3X8DQT4oTzIIiDgCyDmgVhtu7NXy/zBTmrQLJ+4zUanOtciXpKOyAw== X-Received: by 2002:a17:907:608b:b0:a9e:b28c:29be with SMTP id a640c23a62f3a-a9eb28c348bmr157920466b.33.1730786130944; Mon, 04 Nov 2024 21:55:30 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:30 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 06/16] staging: rtl8723bs: Remove function pointer hal_dm_watchdog_in_lps Date: Tue, 5 Nov 2024 06:54:53 +0100 Message-ID: <313978b8c0f331200c1a8dc3382b01088930c0e8.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer hal_dm_watchdog_in_lps and use rtl8723b_HalDmWatchDog_in_LPS directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 --- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index af72e0fe6fc0..f3666b26ffe1 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -291,8 +291,7 @@ void rtw_hal_dm_watchdog(struct adapter *padapter) void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter) { if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) { - if (padapter->HalFunc.hal_dm_watchdog_in_lps) - padapter->HalFunc.hal_dm_watchdog_in_lps(padapter); /* this function ca= ller is in interrupt context */ + rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in i= nterrupt context */ } } =20 diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index ff899a066b33..844ef4a80ad0 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,9 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->hal_dm_watchdog_in_lps =3D &rtl8723b_HalDmWatchDog_in_LPS; - - pHalFunc->SetBeaconRelatedRegistersHandler =3D &rtl8723b_SetBeaconRelated= Registers; =20 pHalFunc->Add_RateATid =3D &rtl8723b_Add_RateATid; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 311a97c31518..1e2bed9ebeef 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,8 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); =20 struct hal_ops { - void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); - void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 6B93A1FEFAB for ; Tue, 5 Nov 2024 05:55:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; cv=none; b=Hxa7PNkEGoEmdHswcBmEZnWJ0qtrrZLM9W+tP/yIK7uAecCnJpBDsot/gbtSQapSdbZk6KPQaIffDgEGdxZbZ4k0dHT8yNkqjw8Gcn2JdwYg0wWkcSrto8DIYn2GoyFuxVEgeuq07WgLmY+91NQL2UT91zl3dAv1Jq+b3OsEPxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786135; c=relaxed/simple; bh=TTGVCQGQFr4YXw/oF7vJ03ZJrq7NoK3BksPLgwn8d7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GzaEJOH823OvrB8zobMeUQa23Gfr439tfXVhEfVpF4QNlMLribc0OO0arAQ4kYrCQQPxDv6G2ZPtqdmPj9WvXKP0xJijg366iv9wqlLGqQUSIg3gU6ewD04RnR0nHpKDM2h7cbYkTShJ+rHumT9gBdNSdNDkIqKlDdyPpS3aYAQ= 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=Fxk+Gl98; arc=none smtp.client-ip=209.85.208.51 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="Fxk+Gl98" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5cb74434bc5so5916389a12.0 for ; Mon, 04 Nov 2024 21:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786132; x=1731390932; 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; bh=yEmkvwR7yW6qeFeP3oE/KKsUKrsSjbt8xvDhetIbI+I=; b=Fxk+Gl986S/ou31XEWQFPFFV024ziT70OZkGA5J3bPKOMQPdB46UZW+Zv9o0FiDKtJ d6j98GdrX1KBWe0TW/y7Cipp2hJD60VbFzQa/X1ApzcmJ+wvvbD9AhxmZuOt4VKoeup2 niCxTnzGDF++nccuDc98Sky0V5hM0blNKmfWb99Unf+6BrW+5r9LBtqXz0hMUUGf+j3J gaQSD6Hcljaa/tfXVh8CqVbRdCwqk1X835kIpOSJCA8YVlkfxdwydG34CHhLD4UnS1ha 31p7yZ/gCIAz6rKnaT8wxjzRJ+YdIOU2OGDH/ei+VcQBhckQHzQYfTKfJ6TU5N+YzDRN 8hGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786132; x=1731390932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yEmkvwR7yW6qeFeP3oE/KKsUKrsSjbt8xvDhetIbI+I=; b=QCUWfGXESGR/dWQlSfnVlHO7vXE39uoWpFb/XCozaq1XSHJuj5uMr2K31X542cjBbT nhsvOb6ycGNDwCEYR62kQD0qjuYGf3C26Og2mYecC6orWBgjC6+vI9ZV3m+abYHXjhdk X4F5cPnA19saAkJgFGi7E8D5iA88iN67GfQyPHLI+r7eIddl0D84U0a9rcrGWSYTuFZE Ssjt6MrGdVsDx6KRXv/NxieyjKZMhZLg3/XgW3M8/tyuGC3BXa/uh1NIC3+hH+McaokF Nrc/dqIhAKQdXtb7rXS94ObzU4nUmtQe8JKH8mJyU8WyKsdBWecpckmbKbozQ5q1FfiD xmNQ== X-Forwarded-Encrypted: i=1; AJvYcCVmwxIOHwhv210OmUnD3Ir9D1owqzgxvzzQGdl1gKQKYFB+qkNoB7/0Yhd1JmsgXakKkFSOoGXO+f3xXuU=@vger.kernel.org X-Gm-Message-State: AOJu0YwQVzL8Urwup1oyK4O9yEBvxAAOHNG783XznUkUhVzjHXa5k4p7 OM/jp02jPzK3e/e0HNiSzHv4sjFBRi9yOo1B10ARoD6HLyUHjGwd X-Google-Smtp-Source: AGHT+IGF+J4gLfIlwE3tvzL7ikt/ElZeoDGvUzwpQikuyHX6/KURvVRMaGHX2UxDxoQSI9EDaiJuQw== X-Received: by 2002:a17:906:114e:b0:a9e:93fb:3d5b with SMTP id a640c23a62f3a-a9e93fb3e5fmr620376666b.19.1730786131490; Mon, 04 Nov 2024 21:55:31 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:31 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 07/16] staging: rtl8723bs: Remove function pointer SetBeaconRelatedRegistersHandler Date: Tue, 5 Nov 2024 06:54:54 +0100 Message-ID: <4c5eb3b6e6ad0015c97d89df637253318c18b520.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer SetBeaconRelatedRegistersHandler and use rtl8723b_SetBeaconRelatedRegisters directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index f3666b26ffe1..483f0c163bef 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -297,8 +297,7 @@ void rtw_hal_dm_watchdog_in_lps(struct adapter *padapte= r) =20 void beacon_timing_control(struct adapter *padapter) { - if (padapter->HalFunc.SetBeaconRelatedRegistersHandler) - padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter); + rtl8723b_SetBeaconRelatedRegisters(padapter); } =20 =20 diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 844ef4a80ad0..64eb1786d8db 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1625,7 +1625,7 @@ static void _BeaconFunctionEnable(struct adapter *pad= apter, u8 Enable, u8 Linked rtw_write8(padapter, REG_RD_CTRL+1, 0x6F); } =20 -static void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter) +void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter) { u8 val8; u32 value32; @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->SetBeaconRelatedRegistersHandler =3D &rtl8723b_SetBeaconRelated= Registers; - pHalFunc->Add_RateATid =3D &rtl8723b_Add_RateATid; =20 pHalFunc->run_thread =3D &rtl8723b_start_thread; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 1e2bed9ebeef..2df25c1e7b5d 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); - void (*Add_RateATid)(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rs= si_level); =20 void (*run_thread)(struct adapter *padapter); @@ -300,4 +298,5 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 = variable, u8 *pbuf, int l u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); +void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); #endif /* __HAL_INTF_H__ */ --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 564DC1FE118 for ; Tue, 5 Nov 2024 05:55:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; cv=none; b=OjXAXCah9EMQnaeu/07hiD3ck4cyA29w8udckBnuTWj09VKqex9bexIkwAfJpEAkHEN2tAmF3EgXOqk4AIMHxi78mp8aYr0MGmBGBAraFFiVrrSLpovsfz6klO5fo6MmvuNzn7MREXKczaGbzUgYercAPVfVCu5g1OsUi82DrLI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; c=relaxed/simple; bh=YAdt10EKqZnTSbx22QnFbqqLVkByFk/br1WnjmqVLU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G86KGURJuk6eQ5FSkWxpIEoefpfh4NZN4ha05sBOGjsJcv0opx11lTCIIPJ1rss/qCjma5Oevm2CkpIYagxqCqp5IeZCwbESztCHizFXramg2RRLwL0Q130En/zskNVU26txWkPIlDElOV40M1bBNPh1MDDyslCC97xV1T0jBuM= 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=DJP5zfzH; arc=none smtp.client-ip=209.85.208.42 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="DJP5zfzH" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5c9362c26d8so9127743a12.1 for ; Mon, 04 Nov 2024 21:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786132; x=1731390932; 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; bh=ogLkc/HIhn4oQotIbLwf5N87GIAE2Iivlj7UzKe+4uQ=; b=DJP5zfzHBpRL6plOtH13rBmPZUIaVbWiEI8a9gmtpz1+v0kzmhCXZS8DVnVqtzUSuI UVp1Lu2+xKcywlZehikHPyztok5FMh/ZwtxGioGZsy4QvcHmZSd3Omo8zVTsWXmlWIgQ CAZljIedu62q2pI+wmy/utrRVPo8j8yv9brBaPDSiICr5haiZZxHFd7wxnFnkCYdUaID NGTjr5J8x0P/nH6tyE10aPgaxQxTFEB+TwPPmiKJgyMGz5av1239glFXp7ElRaBqRZDP EOFsjNKsPvT02rJ+j1pWeekPzPo6jHjBZGQgHcmbB+GxtgMMK2FC3ZtaIY/w+KK8qjry PD4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786132; x=1731390932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ogLkc/HIhn4oQotIbLwf5N87GIAE2Iivlj7UzKe+4uQ=; b=NVh3rngAudctOQjPQrUzZwsq7I9fNGUeJ+f8cWV9QTrXWOK6SimIsj+xbqsTbmkylC ZUQGHD6YuusWYivHDmxsYw9kTYD6ymrOUOVpXC6Duzeg7S5OZ510rQYZgbMFKqBq8QvA c9lvZy2LbZG+w/rlVryzekym4pTwVPamkJ8GZi/oxqMaO6VETghlxd//W6uf6lMQ5486 MNXvEMGBHoV+vbY/j0doaHo6K8ee5mLLUXfx8xvDakc1PBKTpjDbxuOyPZhARmQXp1th ww4AQGhWgF37fegPQ95wRamIAl7PfPfG76MspaSSkn9nx8YHj9HOfWlRtT7ZK647XTd1 fn6A== X-Forwarded-Encrypted: i=1; AJvYcCXCHPzALtppPmTf0OEWwJzVFzrjlAJsLdMauk1ZGgpmCYj/SXLCDSH0t9dFG8aWfKDZrVQp+iZVJQBJaP4=@vger.kernel.org X-Gm-Message-State: AOJu0YyEfvKntnQ3q98gdGRxbRbPv1vM6QDfShOHuWcnMCyhF/JhzBBi x9qznRczTFuqNcMvUu2d7jvE77p5fBxblyglnVEcEXAaJ6DltxpE X-Google-Smtp-Source: AGHT+IGsG3Xwr1iFVxlgkNa0xbYHo4XUeCWlg32yEp8sbLS4Hy0fxzu0ihDwtfCDLs3SuGdY0d9LEQ== X-Received: by 2002:a17:906:dace:b0:a9e:670f:9485 with SMTP id a640c23a62f3a-a9e670f9594mr1381412166b.30.1730786132028; Mon, 04 Nov 2024 21:55:32 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:31 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 08/16] staging: rtl8723bs: Remove function pointer Add_RateATid Date: Tue, 5 Nov 2024 06:54:55 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer Add_RateATid and use rtl8723b_Add_RateATid directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 483f0c163bef..46da566106ae 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -227,8 +227,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 r= ssi_level) =20 void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 = rssi_level) { - if (padapter->HalFunc.Add_RateATid) - padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level); + rtl8723b_Add_RateATid(padapter, bitmap, arg, rssi_level); } =20 /*Start specifical interface thread */ diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 64eb1786d8db..66c2a8fb2454 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->Add_RateATid =3D &rtl8723b_Add_RateATid; - pHalFunc->run_thread =3D &rtl8723b_start_thread; pHalFunc->cancel_thread =3D &rtl8723b_stop_thread; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 2df25c1e7b5d..dc5bb61294b0 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*Add_RateATid)(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rs= si_level); - void (*run_thread)(struct adapter *padapter); void (*cancel_thread)(struct adapter *padapter); =20 --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 759731FEFC9 for ; Tue, 5 Nov 2024 05:55:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; cv=none; b=WTreygSjKUGYEM4aTFevEGcQfnR59qPgEt/9bDi/93I3ft9eZDGp4nY/qKkAmLNqK36fvsuhguklfWUxQgaovgcyfPrAMwQucxZZS3PjBu8bWJAL32abksjxGiR6wpGajTBeBjEtCNkxBLeKVToE/R9Is56tE4JkE0edHzxHxFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786136; c=relaxed/simple; bh=9oxoSNrl05LDnfU19cL4GGdDL9tbdwm3S1/shv4n9rg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PrL7w1617jR5ro3xBrtYFxg9R9x/dDN+f6hK5eKXx20HCdPhjB+Se2J3Ez7PHRueFB4ylDKXrtLFACQYespPGKWkrf1Fzd5vnPA+OCW9KgLYY8phXt+dbJSgYHYq8Y2240tNYXn5rTwqz+pAdFAscDxFpTqT0Io4poUxcvJ2jEQ= 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=MuzjrdHU; arc=none smtp.client-ip=209.85.218.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="MuzjrdHU" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a9e8522445dso465885166b.1 for ; Mon, 04 Nov 2024 21:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786133; x=1731390933; 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; bh=rHh53OxhseY5hazfP8y9zHFBWmzPsydNQrxS+Mqf09Q=; b=MuzjrdHUxqj1ZNgczZTMFAXNhNiNIlOVdrdHKiPPkVJVBudJCA4MDB5ExHT/XWj3U3 M5E5e4qUUghKBxlyDGFiJMoak2/tduBREDFQyKBzraAF/gMjWoEu84QllRyESNkNvBIc LFh9Xwa7jqYj4gu+ip5TF8BEYziX2wg5vc/lURq65N8RRaTvNQ+bueULCkMYTqSrQh5V wzRiITK7BYSaXTbpDllKw8gnA/OxznbUpiLpxW5MIEBLK4k89pIRhN/bSxtZbo5ZmVDe 305ZgsWnzeDHCl4IdE7ZlbP9i+l6sWsGwPOEofJo/K5f8iiakjY42IUs2w6U1MdY8FGt VM4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786133; x=1731390933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rHh53OxhseY5hazfP8y9zHFBWmzPsydNQrxS+Mqf09Q=; b=HvRUghAVLfrry+IgyJeygmftMlGH8uMYCuVruLHnjBtyqr3sR95o0mRdAbRJqKuPXE 8JSnPbTzrkFmRNLj1yXZMu3hANt7/u068il5iCGHm5w0m2boofE4Z9odi8JHVPNey4lc f1q4OiVdq6DUcf2lTAiivgWh3oCVpAedkTXfomsmUSZUsImNdWAdp0F9bUaQEGll5EDr 9I+enwcj8gwXkpbwn1F1URq3VDitjweVwMD6GpcQ9wvEDLMUcQEYOnPmW9CfY36LjZV1 z+N6PgW9SBXTfL9NGPlQSJ27VWWKZqdjGmPX4hB8ML54Zz8YjD7p0CaQb3iTyWct3wMv U3SA== X-Forwarded-Encrypted: i=1; AJvYcCWFecPVrj1gfsdFEBis6gwlHb6pn/CKGMuLZt0TjMdaFGPr6ejXt8CWACcSfBE00laQ0Zd3FeFv1rTswHA=@vger.kernel.org X-Gm-Message-State: AOJu0YwISIKdBDnKrEvBf/w4WN4+HEdN1NWYKDEZcsJJDqwucAuC4Pjj IdmBiFztGbeE6kcJY8Or0XZTljLDMzN+n2wbFps3XgpCEBFc0HJDj9nKhw== X-Google-Smtp-Source: AGHT+IHhGA3OH/rcaYhretm6zSBAxAb2/EldQCnER6BsvR1dEsP61rnKJTZg01jOiEoS4uGu/J1a2A== X-Received: by 2002:a17:906:c145:b0:a99:7bc0:bca9 with SMTP id a640c23a62f3a-a9e6553af4fmr1500239266b.3.1730786132567; Mon, 04 Nov 2024 21:55:32 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:32 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 09/16] staging: rtl8723bs: Remove function pointer run_thread Date: Tue, 5 Nov 2024 06:54:56 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer run_thread and use rtl8723b_start_thread directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 46da566106ae..28d15536abbb 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -233,8 +233,7 @@ void rtw_hal_add_ra_tid(struct adapter *padapter, u32 b= itmap, u8 *arg, u8 rssi_l /*Start specifical interface thread */ void rtw_hal_start_thread(struct adapter *padapter) { - if (padapter->HalFunc.run_thread) - padapter->HalFunc.run_thread(padapter); + rtl8723b_start_thread(padapter); } /*Start specifical interface thread */ void rtw_hal_stop_thread(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 66c2a8fb2454..8d8270d85f96 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->run_thread =3D &rtl8723b_start_thread; pHalFunc->cancel_thread =3D &rtl8723b_stop_thread; =20 pHalFunc->read_bbreg =3D &PHY_QueryBBReg_8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index dc5bb61294b0..3306c26ed2a4 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*run_thread)(struct adapter *padapter); void (*cancel_thread)(struct adapter *padapter); =20 u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 1764C1FF7C9 for ; Tue, 5 Nov 2024 05:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786137; cv=none; b=JZxMRy9DnSAtblxzCXxCXyneG7uyiLM1/unVtqscgT4D+2UnCjwI1mPWSNTj3JHA0gfjJbjpPLXQuvYKzx1mmbCMxFKT/X7rAcnSrHYU/GmG8Q0hfSyH77kEwX36zOcK9+wPn89qtoII3khKQsOsmTTzouYPwGJ+65LHgSmeAlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786137; c=relaxed/simple; bh=HglkhNzncWm++cDmzY1QBdFTq/C3UWh00tiePddknxc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nDHY87kGzg7OzY6y3rhZhZgWwWnPIMJGwokNPlz5gnf73ztWfN4DTBJEhUqgZWl+sMWlkiyucHugzokA4hRxdb6zlaBvFBEiEWHeSEYOKT3dAOvnCxEY4i82u+7Ja5NPMnm0bdC4/5xMQ/jyQV4z+EZaOQazC2WNIBzSfacTIes= 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=a8RurbdV; arc=none smtp.client-ip=209.85.208.49 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="a8RurbdV" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5ceb03aadb1so5331395a12.0 for ; Mon, 04 Nov 2024 21:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786133; x=1731390933; 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; bh=5c9Awi4gQwnX479vvOPVy/wJUH9Kd2C6R7oi7odwG+U=; b=a8RurbdVY6CeQoVNHS7ZDYYy6oK1CY5Ozt/Sr1CDQJqqSQqSQ0qStf0fbW0c6fvfa5 FkKYZ1n4K5fKgNMqLjLM0rNmMfHbSS/Nj1Xno3c5FfCTZwkzEU7lzg9yFsBBURkZou87 ey79ehYWKhdASFUTFSl7lVKgCBrU+aTf9mT3YiHjC4D3+zufkszwW5Ak4y68PG+UzhhI 9A807a62v1Erg6djfSGiOJSwZwK/WRIrxYXVw1kObi/+xHD3b61yq19HLH8mbn4ok+Wd joNu61G8edijmHC1gXFMcMKtFGfXTYXQMuzY+tocYnr2ifcHdA0BLUPWI/0p/WioTx3K HI8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786133; x=1731390933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5c9Awi4gQwnX479vvOPVy/wJUH9Kd2C6R7oi7odwG+U=; b=H+7wT6QSMWPyldC/F7MhTkcQOElhvj1iwchzOumgK+6rqmhzYBfHgluRxvurW5b9TC C4DzITRrZwQyLEQyVyYE83/0lFD42i+8mGRPMPolfe6WEAU9AHphPA8pbuivt836JcHI Av2mep595RJGvkWv6qfdGn5qPST4vc0QT81yI3UYOUYL0BimpxUUL115ZW7vR4F4xmPx Eo0bfEsPOlb1NHuJCy68o7moFH+P51q/ocsUNvys6QcZFFZrIUpErTzO1IO3uc1zRQ9n yAUMrA3C7E9VdTmDJsXdal3PHIXld4Gw7ddgjzpMR9H/Mv2xLX1An1DHcUJUUaauZwVC JBEA== X-Forwarded-Encrypted: i=1; AJvYcCVO8WIjtLgXXiNMeSmSxwj1a0kWa/a8uO8Md+HMZf0RSG5uEqmwzxqLA0eu/q7LWgpVPZSJtA6K7r/j9mE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7MsP4omIJ3aFs18s9qhqDG/QQesAWtTUf4OYVtrqffJlpiqDI sNMZebyje2LI4RYFcnAbC0yXqrR6MBjfmZc7OGriSBStlg7rsm3O X-Google-Smtp-Source: AGHT+IHutIpV9r6Mt+L/j/kjgTDJPTDItX13wBgylN1fVRc0YUZpR3UiBzS/+X6QOnu5NIfPd9P13g== X-Received: by 2002:a17:906:561a:b0:a9e:8522:ba01 with SMTP id a640c23a62f3a-a9e8522ba90mr777118966b.39.1730786133173; Mon, 04 Nov 2024 21:55:33 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:32 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 10/16] staging: rtl8723bs: Remove function pointer cancel_thread Date: Tue, 5 Nov 2024 06:54:57 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer cancel_thread and use rtl8723b_stop_thread directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 28d15536abbb..22c41e4deae4 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -238,8 +238,7 @@ void rtw_hal_start_thread(struct adapter *padapter) /*Start specifical interface thread */ void rtw_hal_stop_thread(struct adapter *padapter) { - if (padapter->HalFunc.cancel_thread) - padapter->HalFunc.cancel_thread(padapter); + rtl8723b_stop_thread(padapter); } =20 u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 8d8270d85f96..d23e4b1c36b6 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->cancel_thread =3D &rtl8723b_stop_thread; - pHalFunc->read_bbreg =3D &PHY_QueryBBReg_8723B; pHalFunc->write_bbreg =3D &PHY_SetBBReg_8723B; pHalFunc->read_rfreg =3D &PHY_QueryRFReg_8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 3306c26ed2a4..02b31c142b9a 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*cancel_thread)(struct adapter *padapter); - u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask); void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u= 32 Data); u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 = BitMask); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 D3F1D1FEFD5 for ; Tue, 5 Nov 2024 05:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786138; cv=none; b=cYMpP7YSI+ITEjw+k6abSWvy8b3wGH6NfhgBtA2HTH8iTdue3Qr5b6qGUE4FhBGb1xanJTGnb/R05i80d83QRYPWkeCWHU9gDWyyDVO9aXXQigcgK6FSPYJxuQzGrbtSPSBpWhd4h2m/lwr9OVzx3GalRD7EgzkEzfVT1KMzppw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786138; c=relaxed/simple; bh=svDsaygyFTZe/9Fa4yspOWzEFRzq2T3AsVoPXnJ61Og=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gxddhn2YRWh4Q+D3K4KkqpONHGT94HY+1dpLafbF24Zo6GNDDDb1+CKj0yk3Rvc3IntKHMEfipzCEs8QEMi4p7lWo7VBxBkfmZlnwFVIV3OCObZGZzPC1LSwmrxN3gCLCr8q6Sk57H2gpLxfaITW1pqQbT2y5QJHduj1QP9izGc= 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=B+6U2vSv; arc=none smtp.client-ip=209.85.167.47 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="B+6U2vSv" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-539f2b95775so5664628e87.1 for ; Mon, 04 Nov 2024 21:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786134; x=1731390934; 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; bh=8/p8mfQcwgmWTaow4D7FS5k0WwDF702iUg3tHZvn7wE=; b=B+6U2vSv0BX6LOhZP8vOQnr+9dR2s1sWNLBcyBLZPoWilZ1TRdXJP5G5Z/U+bfBFXE kGiApe/xgflldju23SSN5y0WqLvrtsfjZzbE0LEJl8GL1gEzoB2OIo56dCPL+T5J5oBn neqlkvpK9GWLoMzKjm2mXUriHBX4A0Ry2GLDXXmrGH0ithwQKLCG9WwFFpuo3juNBM0a G6eyE+/8PFnIfI3rpSg67tm7OONtY/Na/YDCmne4UVEsuriLjsqAkwieT1hTagIxNa5N vt3eFIZ5zFFClIYF7QikRF5Ral6uTYUYZkY2qYh2S6Ez6rITco9Vm2KmpxUXxJU0EaTt pSWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786134; x=1731390934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8/p8mfQcwgmWTaow4D7FS5k0WwDF702iUg3tHZvn7wE=; b=a0SuJTbAf6uj2cNUDU4Qn/aK69pKw6mDmmxMA+1ToDYdGvTJ28yvL9yj8CDUVgpdBD zc+88BdlGvsjPhs8I3mNwTCxdGZ5DSm4wCbhEOmfLhVvt7IrCUoI98ZyvHlSZSk+mIYZ vCVes81ULfqBapDmy3yfOypPbN6kjZdcaDFVNov2wP665/2unD8ZHViyiosmcbvjRhe3 Hog2/nkh4SwsqISvRxsfEq3PkbG3CYwsNZYiNfmyvkTQy15saIJ0Zj0H9Iu/agJfSVUF JN/ejKwz5GFJzR0Z/Jv9OyskdO+eAoN4IpcGM0i0BYhe8iJjA3kxFvAktUjZqdd3iZH2 TPFQ== X-Forwarded-Encrypted: i=1; AJvYcCWzy0Z46922DT+RGHE8brOrXGMMZWksyo8EUGf6A3FoDaLiqldJmusNPhmcpPoxb2ejHcWL1PsAABouRP4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1clQNCth3bfwAAvjpyRUcWd+GNAdUawXnkPJ232UrcnK/0X+2 UpCRqrnaza8fpqhiHw+aABx1Yvn9dxIgGku0/SFW+tmMiZMQnT8p X-Google-Smtp-Source: AGHT+IEeLXt78rYimjyRK8fTPdhONbLzK8bL2pl3MQuLGhvZK712Ig08iwAvKqiv3AYYM1OS1IfkEA== X-Received: by 2002:a05:6512:2384:b0:539:8a50:6ee8 with SMTP id 2adb3069b0e04-53d65e168c8mr10761917e87.57.1730786133749; Mon, 04 Nov 2024 21:55:33 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:33 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 11/16] staging: rtl8723bs: Remove function pointer read_bbreg Date: Tue, 5 Nov 2024 06:54:58 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer read_bbreg and use PHY_QueryBBReg_8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +----- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 22c41e4deae4..5e53d6a56b44 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -243,11 +243,7 @@ void rtw_hal_stop_thread(struct adapter *padapter) =20 u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask) { - u32 data =3D 0; - - if (padapter->HalFunc.read_bbreg) - data =3D padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask); - return data; + return PHY_QueryBBReg_8723B(padapter, RegAddr, BitMask); } void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMas= k, u32 Data) { diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index d23e4b1c36b6..9d1b47f4c828 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->read_bbreg =3D &PHY_QueryBBReg_8723B; pHalFunc->write_bbreg =3D &PHY_SetBBReg_8723B; pHalFunc->read_rfreg =3D &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg =3D &PHY_SetRFReg_8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 02b31c142b9a..f95bd07a5d31 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask); void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u= 32 Data); u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 = BitMask); void (*write_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u3= 2 BitMask, u32 Data); diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/r= tl8723bs/include/rtw_mp.h index f94bb18479da..63b2ee7e824f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mp.h +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h @@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, = u32 addr, u32 bitmask, u3 =20 u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz); void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); -u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask); void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val); u32 read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr); void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 2BE0A200117 for ; Tue, 5 Nov 2024 05:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786139; cv=none; b=ILUaUwPt21ducHZ+IP6jSQkDS1xyy6fzTrf7oniXhYt8Qv+ukrDzYRr9KdnGGnKvfGeYMvazBQSQAiOeQ9AXUe/PxqT0F7u0yR5rQC1ZJPZe2axvO6TkZXYHiRpfdBHnD53+zNJ+aWnyeRmUnQphHwNzSSYMq+2pSQpeINn/Ck4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786139; c=relaxed/simple; bh=28Bkc5YGsObVRPzBc7wWi9s9JfvFJnwV1Px34/m+LMY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qm6KYeJ83OaM3xjHITr4bx/T1GorBmVjIXVgb0NDgFT7jpaFp9x/RfG8mHK3nFC3FlJq94Mzp0WJTYYJRi2OWTVUNoA8M8QHfEcRJ2vWH1IMBQ6KfMnTtefL65L+tTMyZaB1BvdUNXnvSbP81oMp0IhoTCdjuCVcbTd8DZ0Ev7Q= 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=Ka932y9T; arc=none smtp.client-ip=209.85.218.49 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="Ka932y9T" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a998a5ca499so662774766b.0 for ; Mon, 04 Nov 2024 21:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786134; x=1731390934; 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; bh=BJ0gej5hu5i4ouNXd0ApdepNnr3n035slJGM94RcvIk=; b=Ka932y9TRmD88WELgaP4FvGn3IxuM1zRsve4tfgAz93sFjUlEE7he9ickUg/RTbZqF MxuZhxBVGwNZU4OGH0OcZsOcfcmTyJ/S8DgRx0+M0K1ug0Z2fdsQioZWYm33PsWo6CPz V1RqNhPPS5zMk4XmuHwK1RGSoOLcAsXxykroLak8KoIxFT1OEKTxaa6bz/Kz2mhgR74Q 22gullz6cW4vlDvr1KKw6k7WVp3bQEPujmdmj3gXFN1V+5Pk+e4ChGOXscigwFgjGJLS 1DksZByvXw7Gm5jjctS/Lbd4rPy2rKy+5e+7Ub0FxWJxW3UoxmlBF3GN/cVKnKHmLkUr gwhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786134; x=1731390934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BJ0gej5hu5i4ouNXd0ApdepNnr3n035slJGM94RcvIk=; b=iZDm3UKz1ystRhw/qk7PDQWMqlRta/UnDY/6uy2CP3eIaKZs9QIULBI5BIevna1JDx EJVCEZC8BqqK1c00YZWukL7U4+NXSNs2jHsz66DTZyzOXS2JAgwDCVcdHK4VbX/bzUuo 4VzPI+TnSHPn56+EdKnqRpJxMA/qUdkgdgjLQail6Kqbxvbc2OdBMtgRd5eNC8NQ7+eu sq0nFV3u/pxsC+GuXL2ecG04sSYPFkShYkpUb41zzVr3nBa50bJDryagzj8fNdzhfkWq +k0n8qEnJaayaEsrBefNKQr5OQV2jEkSLZAN3Uvzv7Z72w8GvQZ6Vuv62YHaH2tICc1I 9/0Q== X-Forwarded-Encrypted: i=1; AJvYcCWxHWJMCgfjKlNBxZju00v5n+9xML2xKNRYY0TjuVbEfQJvbieYfMOVgDsLAAttk0uyOfpLF/8ZgQU1gdw=@vger.kernel.org X-Gm-Message-State: AOJu0YwyMQXL2kZw9mlufKMrVnwvDmscizM8RPIcZfDHcenTGyDAi6Jz rzOyCSfmq77s9FdS+78qDt5eCy6ENlrhS7EIZPjrzN/+uegi4//DjjZPWw== X-Google-Smtp-Source: AGHT+IFebDS3Zdq8uE5ocERonEnyJ7aAzrtfqYEtNnSmFUVZd3nDg0JDXj06JbVLHlSRZz2ILbv2mg== X-Received: by 2002:a17:907:97c6:b0:a99:2ab0:d973 with SMTP id a640c23a62f3a-a9e657fd76dmr1370951066b.55.1730786134330; Mon, 04 Nov 2024 21:55:34 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:34 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 12/16] staging: rtl8723bs: Remove function pointer write_bbreg Date: Tue, 5 Nov 2024 06:54:59 +0100 Message-ID: <0405fe50c32cfafc95ccf9ceabaa05e14ce653be.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer write_bbreg and use PHY_SetBBReg_8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 5e53d6a56b44..4faa64b1c476 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -247,8 +247,7 @@ u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 Re= gAddr, u32 BitMask) } void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMas= k, u32 Data) { - if (padapter->HalFunc.write_bbreg) - padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data); + PHY_SetBBReg_8723B(padapter, RegAddr, BitMask, Data); } =20 u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr,= u32 BitMask) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 9d1b47f4c828..a8191b84eb81 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->write_bbreg =3D &PHY_SetBBReg_8723B; pHalFunc->read_rfreg =3D &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg =3D &PHY_SetRFReg_8723B; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index f95bd07a5d31..02c18dbc04b1 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u= 32 Data); u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 = BitMask); void (*write_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u3= 2 BitMask, u32 Data); =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/r= tl8723bs/include/rtw_mp.h index 63b2ee7e824f..30badc3f8d45 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mp.h +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h @@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, = u32 addr, u32 bitmask, u3 =20 u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz); void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); -void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val); u32 read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr); void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); =20 --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 D48A620013F for ; Tue, 5 Nov 2024 05:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786140; cv=none; b=IpwKMgUUaMMHE4JK+vr/WSt8p/8/bMSnMDrvEE+7/L3D2IizP7Nm5UmtpVg3NVZauslg42KVpR6Czug6IFFDHIJ+IfGK7sfKhcCRyh+aZGFObpqN9r2p5kv2w/WyfvH8F0RylPcLagDAs/7WFJUm+CqGTiW2zH4gmF859ESURs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786140; c=relaxed/simple; bh=PEV9c5CN8Bf3THfJ8487S+bvz0X2+GqXlJrWWZMXwuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tippl3Ts+hlUfisffsm2WnM+LaGpVgg5POV8uXnY8Gj0dUnTga3z+VKX+Iyf3WvBRZ9GtC8/wSiJgiGOpKw66TFGI53kKhZiXwTl1KpWn7xNsXRx2LB7Odv91UQaDp4LNMklPvVjWeZlo26cAQqHZqknb0czcbN6sHCeVhVaIs8= 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=k/LBcQvN; arc=none smtp.client-ip=209.85.208.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="k/LBcQvN" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5ceca7df7f0so3106891a12.1 for ; Mon, 04 Nov 2024 21:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786135; x=1731390935; 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; bh=/dbr3hyjLdufarxCl5ou3JfFmi21YzpkpIPpuyCwiuc=; b=k/LBcQvNp2d1ZSQlvXNrMkPXDYvjYXJlUAGS2puZ0eSHm3wyn5GtDX5jAr/mABvTC1 da3hU98Q1SykTTLiFZ65EG+Rtn7uiW7Y10MQH1fm2uM8R0LBXqcPKnvUrgIs0vB9dWcK GuCj1PTY6wqHdnBkcBWySQp6Ymw2KRx/tNOdgLL/eMO/NYQs3P1bWqBfQiLrpqhxkCy8 qYSM2ceadKgoCjD0ukaRbZulhwUb0MMmnw36olKp7OMLHyeyWYKvso+KWhhOJPYSnOip fWgVVpv0rFoywDGXdTKeJSxtEczYeV+eBUGDACJG4K0mq9dadz2nja/DlwoQ4ibBETGB EDnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786135; x=1731390935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/dbr3hyjLdufarxCl5ou3JfFmi21YzpkpIPpuyCwiuc=; b=v1yzQsmLzXgPJs5G0c94SET+ZRCxbd0aarUnOZNC8XwufctGXMnfTic73PVnM5Stsd JmlqIhCvjgvoNFvl+Ngb5XpkqTXHf5NTqZ1U42p9cib1v5r31WN0mcVJ6hDnAT3DgOu9 082bxRfKs7X1Z84DiBBWI9B1aOGcoueixSGnlGwmo1q/tVENSZ5j43BXvlxmhuEnEOJr GL4QSi8XD9lyAQpG5HCkpTM4o5F8gUv/5vLvDhOXZ4C4FWJzrCWggrX8Vxr9fAB/F/Lo xAOSC+VyV/ChfnK2Pf128XNAgRk0tQ/cyak9CBKSd/MO2/711FevdlRuA4Jj+jv2Ro5H SNtw== X-Forwarded-Encrypted: i=1; AJvYcCVt91MuZthbTEuPIqb4slSMuclJiNd9M3Pqv3JuY4CKI/qqM+bIthSHM8W2NXVUtyE0JUjAzyBLglDIaOk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywknt+T+JGkVdsy2lEXUZJ4g/ouyrz5dgIrVjPY5bk9thTdzFXK 341MukXq9wR4A58D4QBOV4NJ3uVF8sZ+rGHEhPyJJ8JLOEa8HCiepo/jCA== X-Google-Smtp-Source: AGHT+IFa66zClCw7y1ZHQKr9UEwgvRTchUmrqEfo5OWshmFousmLRQ+gVzQpVYSrQhYWKIy69FfB/g== X-Received: by 2002:a17:907:9727:b0:a99:762f:b298 with SMTP id a640c23a62f3a-a9e655b92f9mr1421084366b.41.1730786134934; Mon, 04 Nov 2024 21:55:34 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:34 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 13/16] staging: rtl8723bs: Remove function pointer read_rfreg Date: Tue, 5 Nov 2024 06:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer read_rfreg and use PHY_QueryRFReg_8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +----- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 4faa64b1c476..11f9254a3bd2 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -252,11 +252,7 @@ void rtw_hal_write_bbreg(struct adapter *padapter, u32= RegAddr, u32 BitMask, u32 =20 u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr,= u32 BitMask) { - u32 data =3D 0; - - if (padapter->HalFunc.read_rfreg) - data =3D padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMas= k); - return data; + return PHY_QueryRFReg_8723B(padapter, eRFPath, RegAddr, BitMask); } void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAdd= r, u32 BitMask, u32 Data) { diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index a8191b84eb81..3f42b1fadc13 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->read_rfreg =3D &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg =3D &PHY_SetRFReg_8723B; =20 /* Efuse related function */ diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 02c18dbc04b1..5c19f329e78b 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 = BitMask); void (*write_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u3= 2 BitMask, u32 Data); =20 void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState= ); diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/r= tl8723bs/include/rtw_mp.h index 30badc3f8d45..30d2539e37f3 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mp.h +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h @@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, = u32 addr, u32 bitmask, u3 =20 u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz); void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); -u32 read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr); void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); =20 void SetChannel(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.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 B66E91FF7CA for ; Tue, 5 Nov 2024 05:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786140; cv=none; b=TkS1FFYqD6nHwCKDVaVZa2Pv8xk4dvMmxczaKV8e3tMoTxg4tiVzkJxrg0dtv20DfHqhW/oeh/Yag3eKE3zmSRNgyBcvDMaXz3/t+iYKBdOZ41bfOUDhmStAYOjIy5rrkIqKgSjNfrSedGuEH37Wk2yhup/AL5PVQjbHRNiLReg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786140; c=relaxed/simple; bh=7mom63PqIjuQbcIDyVxHvfiqYeLfaAPUPom5BpDw+rw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eBw1z6gKF0+FGasLzDSkvfszv9QD629ia7y4i0mzd9Zzy9Pz8LBAggAvHIUyIZmJ+uHvGHbbnaVBDzcHpC4Cbd1xtEUaZ/eWGwab6LfC6JK7o0BMue6MxrSWKc6lrpZca9Pi+ZirncjsyzAN5vunBToE3gg6fvZuyPBxNjtmuzo= 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=gOWkkDko; arc=none smtp.client-ip=209.85.218.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="gOWkkDko" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a99cc265e0aso810559466b.3 for ; Mon, 04 Nov 2024 21:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786136; x=1731390936; 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; bh=72Lw6qcXw6bSIgd6ceAGnZbTTC4nDVjWESZ0ARahZkY=; b=gOWkkDko3y1qtkz2J/rwmrx+D8l4ifODtAUkmeJ1wgd3ZjTDg0tb3D39k7L7h5Rxg/ ymxUPUc4j6ChM39xsu6ASouBqBfnp6KGMmWRF3GaX1s0Od/Ms+m2pm0xJJW1vbh+Y+Zo 1lkq24DgRvHdgMUL6jcGM+iVTYZeG86laKCs4iTyrNYQnmD456fw6qEl4Qa2nhYhsTAk DtdsL4yahKaVO2OjGj9LQEJtQAy2Jd8DKXOT/QFHRBHb+N0dXz12ltRk1fNZakqWDLT/ TEWPqT6MOMcoc2xVJzCWWSr9V0vxQEPkEfjGW46rF5b90zhSjJcglS+dMJWFF2WaQFCV yJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786136; x=1731390936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=72Lw6qcXw6bSIgd6ceAGnZbTTC4nDVjWESZ0ARahZkY=; b=NnvJ1+YBH0YBW07Sn3ftfEiDQl5xRXGV8Ato92D+riU+yNgZZEQubjmsSTAwSKY/FP fTxXXpL3sdTdtVtwMuLJiqhmwvFlLWhckgngEwvnC+UWm2mhN55+b7oDbgzCJAQ5QyoS FZdLS7mRm9pFzaUVreL5QaQXnEWDtOTKBPZS/Z173Bfca6KHXDkMQKmXVA4iIi05byvI J2Met9v/D8yzAR54wuArY0fLCX17eCApCuv62tjYy5yFjmOGs4kGVd8tlqZUksuv3LYE WjpKXVT6ALXMa2NNx0Gif4VeLjOfcEN7ceoLdT2Ce6CwxonBgPqZAw0GfmWMWVcT3Orb /QSA== X-Forwarded-Encrypted: i=1; AJvYcCVEVgjsUoJQPsBg4D9upWUAqGj8MebOOMiRWGtYOdR9Vp6SweRvcQ6IWK1V0XoOrno4RMlCPYadsaYHyjc=@vger.kernel.org X-Gm-Message-State: AOJu0YzDWdivUeS+iNH3S8RuhCjkdaOhzCd7Kw8ulgCYLyfcyNLquJ/e 0vSzSc9EnfxikKxIHCYpeF5uxY43sTphDUzGdEkqI1VlrKNJ+XNyBPN4zw== X-Google-Smtp-Source: AGHT+IH7v1MxAxKTQuKfPWStj4aPyj20mN+ngJBNj3sh6v4ttrDpx3JbMa3EACSiBZT7CPUU6er/Uw== X-Received: by 2002:a17:906:dc95:b0:a99:f28f:687 with SMTP id a640c23a62f3a-a9de61d1a52mr3431068066b.40.1730786135544; Mon, 04 Nov 2024 21:55:35 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:35 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 14/16] staging: rtl8723bs: Remove function pointer write_rfreg Date: Tue, 5 Nov 2024 06:55:01 +0100 Message-ID: <8034bd15f264cf3857f1e5b72e3b4c21682e2e9a.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer write_rfreg and use PHY_SetRFReg_8723B directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 11f9254a3bd2..0db8f623b805 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -256,8 +256,7 @@ u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eR= FPath, u32 RegAddr, u32 B } void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAdd= r, u32 BitMask, u32 Data) { - if (padapter->HalFunc.write_rfreg) - padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data); + PHY_SetRFReg_8723B(padapter, eRFPath, RegAddr, BitMask, Data); } =20 void rtw_hal_set_chan(struct adapter *padapter, u8 channel) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 3f42b1fadc13..24d722bbc34a 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) =20 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->write_rfreg =3D &PHY_SetRFReg_8723B; - /* Efuse related function */ pHalFunc->EfusePowerSwitch =3D &Hal_EfusePowerSwitch; pHalFunc->ReadEFuse =3D &Hal_ReadEFuse; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 5c19f329e78b..ae873147a561 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*write_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u3= 2 BitMask, u32 Data); - void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState= ); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u1= 6 _size_byte, u8 *pbuf, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u= 8 type, void *pOut, bool bPseudoTest); diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/r= tl8723bs/include/rtw_mp.h index 30d2539e37f3..5a1cbd2ed851 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mp.h +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h @@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, = u32 addr, u32 bitmask, u3 =20 u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz); void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); -void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); =20 void SetChannel(struct adapter *padapter); void SetBandwidth(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 06:33:21 2024 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 5C8002003D7 for ; Tue, 5 Nov 2024 05:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786141; cv=none; b=YjCl94r8jsCG14cHbeGwUaz7koFIeBpDWlPQ4YDSu/+PFqUOVgSedO9GUeDmNsQpa3BdBkAIKrtx5WiaAyV9vNyygTS2kM8qstsW7K4+kF81LGPhqezSdzld54/6ng9hkQG9d+fMxDlueKFINEYtCtlDWbHBJPZbyydnjLpzLoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786141; c=relaxed/simple; bh=PcmsJXN0QMgmyVreRV96Z0XZnJhTALbi7MKREO5b/dM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HDTIaOVIqw1UkgLSsTgLucJPjQ15qE4cwgP5G5XimtqRhI/+imagrDFxh9au0QKB7S5arQE/cixDTaZ34u6xD56qbQdh14TRJ3ECWVZNPsdI3MgNp/SvZC7LgiNeG1jorjAwDRXslCSt5BvMyPN8NJjcIho6Ascn6D4jljdGOX0= 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=OhThCpAN; arc=none smtp.client-ip=209.85.218.51 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="OhThCpAN" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a9a4031f69fso797934766b.0 for ; Mon, 04 Nov 2024 21:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786136; x=1731390936; 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; bh=MvuMQJX2aiqCaksyW7T4UdubL+MpISHCMIaun7tvg8U=; b=OhThCpANAw/p7SvV7pIp0ohOxywtKLfStLsOtU0xdeiQ0m7NxUL2JZBZUYtokEqpKj ZWdIkyQlCGN8CVJgbWlol0yS8SY2cMYolD6LXgloDJCa6Au6nfbXVVWLKQ2fWufbke/r VCdM40mLV8GpUKKG1f/WlacthD1Lo2fVhkVVrqZYqVCRa/XRHKti1wVouq7pJnjNABje fPamSNOS1kiapLVDKT02GD76kQ+0DJFVm2/VD4/jnjVOc3aUzcg2gmWaZ44afF7Ys9cQ r5HerZAWV1Roh0g73FLiJYUfc+5r9bS5dI6Zyl21m4eQz9d7eUQDd0VpgA+VnWyI5ECX hDPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786136; x=1731390936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MvuMQJX2aiqCaksyW7T4UdubL+MpISHCMIaun7tvg8U=; b=HWt6sHmycyPuhT2bbeSLkOW1AtqaqFzOo1xBEvBo8wfdveUt8F2fAINHxaQEap9Os0 osw1m8CGWXiiNE7m3JLIoFVnhWEfJWAi+TArw+h29epJQS3QsSN2x6IYq7mkYfWcrC3y 1WWVtcsNGxxOcagGGK33QbVWx9puh8spFycVeAYfqzGnjFaik9wiPjXXSo8gEIaw/g7P iGZuRpy0xOtNVI17EvoZDvm3LCljg+y2r6+CwbkFmK8pHKykShZX4KhGjpbujpAqRGuL 0/0q5MmYqUf4reWp0uiTFwmMRFYqSllVIonax160eadqnQxK+7KpncWp8D/ZR8SDzTz+ G4Qg== X-Forwarded-Encrypted: i=1; AJvYcCUPiuwgVjcabYNAnI/QrlhA+9+Ms0/R0Mf1I9wfYIgvA51o58lDn5ohL9XTHs+wFFmvvDyiFwDHIMkB35c=@vger.kernel.org X-Gm-Message-State: AOJu0YyYCIIuWJz4Fnk28dOeF9Ll1djgrbyYk3ou5qIsBeuuiLAtKHMM J0f0CguD1mXPvJWpYM4wQSEFUu3YRdkduLmU8XZ8ZECjFDMsDdZ7 X-Google-Smtp-Source: AGHT+IGqqiag8wzE2dcO682dhJw8kE28ETTMWcqFjkIy2RKzf0GCSxfDMNm4XcwbGTTUzVe18dlw2g== X-Received: by 2002:a17:907:6d15:b0:a99:ecaf:4543 with SMTP id a640c23a62f3a-a9de5d8272dmr3630244066b.25.1730786136136; Mon, 04 Nov 2024 21:55:36 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:35 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 15/16] staging: rtl8723bs: Remove function pointer EfusePowerSwitch Date: Tue, 5 Nov 2024 06:55:02 +0100 Message-ID: <0ab31bf7b4562104289d6965eb081aa47e1c3998.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer EfusePowerSwitch and use Hal_EfusePowerSwitch directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/r= tl8723bs/core/rtw_efuse.c index 8b671f8a7965..1dee02ecc396 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -77,7 +77,7 @@ struct adapter *padapter, u8 bWrite, u8 PwrState) { - padapter->HalFunc.EfusePowerSwitch(padapter, bWrite, PwrState); + Hal_EfusePowerSwitch(padapter, bWrite, PwrState); } =20 /*------------------------------------------------------------------------= ----- diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 24d722bbc34a..f2c079cebdd4 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -602,7 +602,7 @@ static void Hal_GetEfuseDefinition( #define EFUSE_ACCESS_ON_8723 0x69 /* For RTL8723 only. */ #define REG_EFUSE_ACCESS_8723 0x00CF /* Efuse access protection for RTL= 8723 */ =20 -static void Hal_EfusePowerSwitch( +void Hal_EfusePowerSwitch( struct adapter *padapter, u8 bWrite, u8 PwrState ) { @@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { /* Efuse related function */ - pHalFunc->EfusePowerSwitch =3D &Hal_EfusePowerSwitch; pHalFunc->ReadEFuse =3D &Hal_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition =3D &Hal_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize =3D &Hal_EfuseGetCurrentSize; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index ae873147a561..23786701ef9e 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState= ); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u1= 6 _size_byte, u8 *pbuf, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u= 8 type, void *pOut, bool bPseudoTest); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool b= PseudoTest); @@ -289,4 +288,5 @@ u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum = hal_def_variable eVariabl u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); +void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState= ); #endif /* __HAL_INTF_H__ */ --=20 2.43.0 From nobody Thu Nov 28 06:33:22 2024 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 8363F2003DE for ; Tue, 5 Nov 2024 05:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786141; cv=none; b=ngttuNpztd2sTkXEI4c21PFiDQeYs3eImdgZvprCP43BS4pAJbMSDLTKMz6ZLfvINgM2B5hLmSyIqNffbfJyklJ4pm0O5xOtlyZ81NSxHUPw6XImTHIyA6bMdTmqfd7AvdpjOXhFBqyCP355CfMxsFv7s1qcWtRtbmq2tNFQsZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730786141; c=relaxed/simple; bh=WPq8qkWAjEeyhL651g/gx0ZCAZJ5T20+vC4lFpVBkAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U6tav+C1oI8dgASYUjWJMD06UmDpswVMPDb1hNn6sQQ+2UsHIkVHIMVSjL9vjlLL7/xnu0s5u6fYjMUcXtEti8DHDlsTF8l+BzajufZWEPAwkhh1ckFFVjEFoDthItNUIOFGnold4sTWGx82G1QVJRCwa40/2KUAa1e/Di2tfbE= 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=ReVE2gNX; arc=none smtp.client-ip=209.85.218.44 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="ReVE2gNX" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a9a0f198d38so851201166b.1 for ; Mon, 04 Nov 2024 21:55:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730786137; x=1731390937; 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; bh=CqM06z+njLF7FAtLYNvhAE64PBnYV16u4ZqhF1r1t3g=; b=ReVE2gNXC8LUrdbAB4kfIm4WLyVCP3s3QF3dNc+5zbkZIzJM+Yr9Ls14P9bUmM2+YA W4FZOH0vLR1ajDbqc9c+1PEFR+LZdQQVjIKjOgKGbKXt+KQsd0bpoX4Or8ZGAjoyuUaw BK12XFPaeIaL5KF54u+cOcRhpltgfCg1qrFg8uCH4tuluQpWNuX4t2/L1MnYzLH7yzgg 3yWurP03Ek8o/21OWTdczU3CPglB098PhXgcfADnmSD2a3L7jC+9z4R8CI6DfpGN90El 0GKJik2/HN+hPH5D7U/fIF4WmCHQtVyZPBd9A96zay0VrxMyPp5hjcKZzQe7GxVkbyeh tb0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730786137; x=1731390937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CqM06z+njLF7FAtLYNvhAE64PBnYV16u4ZqhF1r1t3g=; b=ba1x/DcSMWpOGkUP5ELahX9/EmceauLAuRI0A3xjlxq6u6PWoA+4C+beIfJxTp9N98 pTeKTrEI74buHyExmLqzwFfp0GMic9tXkQxM8HZ+zX0qFyJvZsGCA+518hAX5SAwEqqT i1LsYaG68M/6CU2JdwqnPdVJvsT0EXguX8IsYXWgb6v+bjXqofnOTyRPsfKt8WHtsh+W 7z6fOze9uZNNHnVdjs/ZJ13hv0SlhO1L8n0ARv1vmz8Z9GJxCV6QrxkDKmgyfZSgmABr Z/XSMUKSmOdcsbmPQ/Uzz9k0wVMMPUDVPzRptfrolOX8uxWdYZN3Bii8VuBLaSPxViXa JiLA== X-Forwarded-Encrypted: i=1; AJvYcCVquIjizKRdm9GtKc+Q/73Kq+s1cjaRWH3SOOIBZkq/ZxByhrQSbiOsYhwQUJPtscnrK3Et76utNfhgq3g=@vger.kernel.org X-Gm-Message-State: AOJu0Ywk5yDz2w0ralpQTyhXcMtfKRa5vIWlgIGGo492rQ2aSpSOpQSj frmPVOHLm+5FvwHctopkqd7mPq8GDd3ktC0pKyCSZR+iiM8EbC+xcCuWTQ== X-Google-Smtp-Source: AGHT+IFzwXympF+JOibyojurFfcbVMwrGzz1dED57CQe91tFRPmXumRPRTNTwts9jUYaudoUrQduDA== X-Received: by 2002:a17:907:7250:b0:a99:33db:2035 with SMTP id a640c23a62f3a-a9e654d5e6emr1508894466b.26.1730786136709; Mon, 04 Nov 2024 21:55:36 -0800 (PST) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb181451bsm78775466b.201.2024.11.04.21.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 21:55:36 -0800 (PST) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 16/16] staging: rtl8723bs: Remove function pointer ReadEFuse Date: Tue, 5 Nov 2024 06:55:03 +0100 Message-ID: <92e249af89320d37a211397da7ccf82878359c60.1730749680.git.philipp.g.hortmann@gmail.com> X-Mailer: git-send-email 2.43.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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function pointer ReadEFuse and use Hal_ReadEFuse directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/r= tl8723bs/core/rtw_efuse.c index 1dee02ecc396..b6c655e6747e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -159,7 +159,7 @@ efuse_ReadEFuse( bool bPseudoTest ) { - Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf,= bPseudoTest); + Hal_ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); } =20 void diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index f2c079cebdd4..2d2de56d5df7 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -887,7 +887,7 @@ static void hal_ReadEFuse_BT( kfree(efuseTbl); } =20 -static void Hal_ReadEFuse( +void Hal_ReadEFuse( struct adapter *padapter, u8 efuseType, u16 _offset, @@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { /* Efuse related function */ - pHalFunc->ReadEFuse =3D &Hal_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition =3D &Hal_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize =3D &Hal_EfuseGetCurrentSize; pHalFunc->Efuse_PgPacketRead =3D &Hal_EfusePgPacketRead; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 23786701ef9e..2285e82ab7b2 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variab= le eVariable, void *pValue1, bool bSet); =20 - void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u1= 6 _size_byte, u8 *pbuf, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u= 8 type, void *pOut, bool bPseudoTest); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool b= PseudoTest); int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, = bool bPseudoTest); @@ -289,4 +288,6 @@ u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum = hal_def_variable eVariabl void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState= ); +void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset, + u16 _size_byte, u8 *pbuf, bool bPseudoTest); #endif /* __HAL_INTF_H__ */ --=20 2.43.0