From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AF4D1581F9 for ; Sat, 5 Oct 2024 20:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160491; cv=none; b=EAvdRVUxQ23ZgCA+qiGNdfIKmGRwF69gaSQxDmTtXWxfV5d7LCYoVmgr1ddHJY2WZloB+U5DOzhy6i4Frf/7QZAcEM8Q51iUxJx3PqovdOLBO2N5RHWhPzn/k90hAEcK+WsMnaaZW60XiMxU0ShGJfu3Y8f8XaO+qMS4kXqBR0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160491; c=relaxed/simple; bh=X9DHnhb3PcjWFlPozmUkt4LTX03S1xya3WRzJN0hsmk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aH9eHr34+96Vxb0JToPzGGyp3qiZgcnAy87kGrmp7K9+/2GYY06gNcw2rku6c1oywRdeIbDGWCFHrAHMyVTkUL39WQfj8sXgnkXZyVpk181zhFswR09phjj9PPoIkEOqnxgI0/+bUK0LzAU2md/zA30he+AOymTyhQdHCrQl01w= 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=LRlT3cwb; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LRlT3cwb" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so41609685e9.0 for ; Sat, 05 Oct 2024 13:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160488; x=1728765288; 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=n45JSFh+Iunnvvyo7iSbLfdkXzJD1ATFvBRpOr0mHbo=; b=LRlT3cwbKzxHzZdrSgKBhtw8nZZW+nLMkUNzzwDLQ1SKDGCseltChz85na++vyL+Um P3WLnCE0wa1dgNl1OXl40yeQ/QfwcqDma+Uu1S8nCNrmFrR9W+ZMKqWd69qvGPHBB2U7 Eit2hq0YoOnKiFv+vvsxtVNjvcgJrsvINr8EybWQHtxyHNQqYNPDXFsFKbYZSs+57QK6 efeu4+Y6KG2n+ezK3mS9+AxszQW8O0npR8UwlIc7xr6C/UqC6+oz5440BM+f+jG3LRr2 W5gtDfBsiLOg2bFhQ0w/liaUV3Ms9LpwT+78ssL2FI7vHUTY8NghKva3CZPolidoVQbo AzTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160488; x=1728765288; 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=n45JSFh+Iunnvvyo7iSbLfdkXzJD1ATFvBRpOr0mHbo=; b=oNf+CyhJOSH2mQ4i4sOOPJrt4bXSj5cs5rDBPNyhTGz+Cgvb1aXwDksU/oMffaS1Ql ZNQ/MEseejpYFfm2RZ0PulXdoGxg3n4B0T5HDFp1c3qavhg+ndOSpeJEfAPfizwZCWG0 jaP0t2cKXCOdLmvAPnZ0ek4cRlv5yM8AtKdkLf9dA3mfiYzuZbm9hTqgYZiFsLHNN4nA g3aicGzt1/kaCzBX8pV94DKmnqmc/FmQQaPvoqIQEzjBaCXwgP4yKmNweVypFvMTx3Fz lnTMixOpQ0gTHpq2etvlvqdLNWLET8mwOTWAE1+rmYy6pVndSG5bmwId81VCQuZlPne8 4Elg== X-Forwarded-Encrypted: i=1; AJvYcCXKwOegE5ctTLdK0OEuQu9TkPeBM66vRZgue4Wl43a8mVEIUhotMs7bvtbhqcJm05CKUPjSgRc8qNOrTvI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh/7YAlPn0MCLstD/a4jtH1rhhMp39idSfWk9f0mkFBog+ECvM Gg0l9dZTl0JWLZaOaVDVgJ52jRdrsdaPz2UuW9vf3QI0bJbW8iviOSKuBelw X-Google-Smtp-Source: AGHT+IE9+Wiqg7TlFmhDx2CKfX+QkqSK/VLv2J9Yzz7wRUqNgXo9P/u1Q9pxMjZl/rI6GPM7EW7u7A== X-Received: by 2002:a05:600c:1f96:b0:42c:bbd5:727b with SMTP id 5b1f17b1804b1-42f85ae974emr69950985e9.25.1728160487765; Sat, 05 Oct 2024 13:34:47 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:47 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 01/15] staging: rtl8723bs: Remove function pointer hal_init Date: Sat, 5 Oct 2024 22:33:44 +0200 Message-ID: <5c838981141aad1275cbcbe862ac7885de9bb8e9.1727966761.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_init and use rtl8723bs_hal_init directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index d675a5eeaddb..684d31360f4b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -78,7 +78,7 @@ uint rtw_hal_init(struct adapter *padapter) uint status; struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); =20 - status =3D padapter->HalFunc.hal_init(padapter); + status =3D rtl8723bs_hal_init(padapter); =20 if (status =3D=3D _SUCCESS) { rtw_hal_init_opmode(padapter); diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index c54d6dc1a495..b4819ff2928f 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -583,7 +583,7 @@ static bool HalDetectPwrDownMode(struct adapter *Adapte= r) return pHalData->pwrdown; } /* HalDetectPwrDownMode */ =20 -static u32 rtl8723bs_hal_init(struct adapter *padapter) +u32 rtl8723bs_hal_init(struct adapter *padapter) { s32 ret; struct hal_com_data *pHalData; @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->hal_init =3D &rtl8723bs_hal_init; pHalFunc->hal_deinit =3D &rtl8723bs_hal_deinit; =20 pHalFunc->init_xmit_priv =3D &rtl8723bs_init_xmit_priv; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index d959be13fcf3..fc3a94e40721 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 { - u32 (*hal_init)(struct adapter *padapter); u32 (*hal_deinit)(struct adapter *padapter); =20 void (*free_hal_data)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_xmit.h index ad2542d0cabe..5e3483cb22db 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -405,6 +405,7 @@ struct txdesc_8723b { void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem); void rtl8723b_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 Bu= fferLen, u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame); =20 +u32 rtl8723bs_hal_init(struct adapter *padapter); s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); void rtl8723bs_free_xmit_priv(struct adapter *padapter); s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitf= rame); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.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 487961591ED for ; Sat, 5 Oct 2024 20:34:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160492; cv=none; b=XKP677e5ZWdx6/QfMtuVN8Ucbqa4DuOpZDwP1YEeC3uEsW3hr9rOwQnlHBv4EGZORP4F7UbzuPeqKn6XDegIGH8JHuvHFyyNqF2eSgg4g3vLaofjy2XYv6Su2U7MgqAJmVLKA5CCdJScnV8vcmBAr4qbN+/si6EDTzehov9B9aI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160492; c=relaxed/simple; bh=q5jkccRulWr/FM9cDWZHBbIPLgsceK1p3SYDkLvSpgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kgqqfvNn+5pqRjEVJoxjpR8AA62vkCSK0+d2FinbXqBsHpsbNRgs0K5LJCb+1rxjExubxr5KJywvdsDA5KG/e/4wvNPGp5CYdmz9ez1V92QhAOhrQ6zFP6m61befYHikiIV9RuVqro2Ui4+PATW2q8yk09iVSHdIHzQzNt1nCHA= 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=I9F3EAMf; arc=none smtp.client-ip=209.85.128.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="I9F3EAMf" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cde6b5094so31920685e9.3 for ; Sat, 05 Oct 2024 13:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160489; x=1728765289; 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=EGS5wmBGdEuYs+XoDSYSCpWyPDlISJFCe+zrt7w9w7w=; b=I9F3EAMfqKHJ3Qd7E5+iN7XW6Ma8hxySKvgBmjaqHCRpeNGm0YhHp90f958oNiJath qCC4Nb+YYnnPI2vG+5OQlgDZrqxAWI7mlHJ0Mzd6a6keT0PlV4RyonewFy5BFk+Dbdht 2S42vxJuswwVDb8yeBbfWzOnYkpfDBc+qw01zAH5Ym7Fhz/HzbsOg4AkvI/9TSbfwGwG L3h54FCu10UokaNLTqnP+4nJM/QX6XhOs+iO7DhDaJHa05lq5mHUVeZhIu244ElUY5jp xEg3gFxGcXLdVy94lv26TUW5zPaJnWyTpo2+OtFyZegRe8E4CRf0t5mrYOUmw1F/6URr zcQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160489; x=1728765289; 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=EGS5wmBGdEuYs+XoDSYSCpWyPDlISJFCe+zrt7w9w7w=; b=Q0J+19qC8aLwpCnmr3aZDrFARpBPsTbz7YTeD/K2v4hgF820RcgPBxHq+89Mx0O7mL Qfk/CP/PC2+axHpMxxQ0Ru70h/1g/4fACwEMMrJ6K3YO79x2MYnwUS6Y/hl4/mvzbS3o eVE7tq7nWAdB84bW1l1ZGu2RFkbEUjOpdonpEjM7+Rq12h/Kao+0cASVa5ig5KUCy/S7 7plMREsu7qn2mTMn5CV7VWZgHh6FQ+aTRYe3/cs5H0j5o/Dx7HyZ6n4qbJx7A0NyHGgR TbdY/GnJPgd+I0LlHIMJoCn5+fKfWbcezE2DjKyxo6nfKAel15jm1sL9TaiLoaNy49G0 l9MA== X-Forwarded-Encrypted: i=1; AJvYcCVBc6G+Sa+FesCOrtPV3H8V558VF+lo4m52jNGgSpLyW77Hv5QCTYIdaNqTh9cBYNscBr4sXjZyGO61Dto=@vger.kernel.org X-Gm-Message-State: AOJu0YyGAkT7qI8rc2VUXOk/p9schNTOcVYW0fRyTk4tQJEPFN4sIm1n aSCrFKZhz8uAZC/4deafvYonIJoVM+YiO9prGGRYmQsTMPayQxI2 X-Google-Smtp-Source: AGHT+IGitESMSPkFKM4+mm5oFRXBO9avimVzsrnOI1EzNSkPcMlWtmDxXldk+gy5mKpCNwM13iWSKw== X-Received: by 2002:a05:600c:1da7:b0:42f:8d36:855e with SMTP id 5b1f17b1804b1-42f8d368710mr15580855e9.5.1728160488394; Sat, 05 Oct 2024 13:34:48 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:48 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 02/15] staging: rtl8723bs: Remove function pointer hal_deinit Date: Sat, 5 Oct 2024 22:33:45 +0200 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 hal_deinit and use rtl8723bs_hal_deinit directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 1 + 4 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 684d31360f4b..d9121e13fe69 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -107,7 +107,7 @@ uint rtw_hal_deinit(struct adapter *padapter) uint status =3D _SUCCESS; struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); =20 - status =3D padapter->HalFunc.hal_deinit(padapter); + status =3D rtl8723bs_hal_deinit(padapter); =20 if (status =3D=3D _SUCCESS) { padapter =3D dvobj->padapters; diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index b4819ff2928f..d7941fdf42e1 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -884,7 +884,7 @@ static void CardDisableRTL8723BSdio(struct adapter *pad= apter) HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_= SDIO_MSK, rtl8723B_card_disable_flow); } =20 -static u32 rtl8723bs_hal_deinit(struct adapter *padapter) +u32 rtl8723bs_hal_deinit(struct adapter *padapter) { struct dvobj_priv *psdpriv =3D padapter->dvobj; struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; @@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->hal_deinit =3D &rtl8723bs_hal_deinit; - pHalFunc->init_xmit_priv =3D &rtl8723bs_init_xmit_priv; pHalFunc->free_xmit_priv =3D &rtl8723bs_free_xmit_priv; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index fc3a94e40721..40383d3cdcef 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 { - u32 (*hal_deinit)(struct adapter *padapter); - void (*free_hal_data)(struct adapter *padapter); =20 s32 (*init_xmit_priv)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_xmit.h index 5e3483cb22db..ac4ca7e05b9b 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -406,6 +406,7 @@ void rtl8723b_update_txdesc(struct xmit_frame *pxmitfra= me, u8 *pmem); void rtl8723b_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 Bu= fferLen, u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame); =20 u32 rtl8723bs_hal_init(struct adapter *padapter); +u32 rtl8723bs_hal_deinit(struct adapter *padapter); s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); void rtl8723bs_free_xmit_priv(struct adapter *padapter); s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitf= rame); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 0B00715B992 for ; Sat, 5 Oct 2024 20:34:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160492; cv=none; b=od2PCv3990/agNSCuK7ofijGUTnKVIAJXGuAKYAFM8IcT5i7GfQfl5zhk7G20GH/bijumSCqtu+tRBd9i2Qmz3JOtlkbC9Ij0u5etB+emQOLVbVwmXEGIKioawrFYqEB+94arih9sRhAFlOpIVGSllc53JrjDVwIdYJMQFFfPVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160492; c=relaxed/simple; bh=Xlmrw1ICSZSLpyppc3P1wO9DsXKMAXudZrtMHiaVX5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UOUoXgSvhXfF7OP4WcOfKGUGxy7OrMcBdmbXGcSZkE7pt5oItxrNbqxuei8/nouEUdIwF8eO4/JtAQcg1iBsmCOLf7VIGimiQRN0AKeIFDNQVeHtj95Hgj6PrRCaFiYTt3bXEBrrLHO+fiBiRRPiNVDT5+AzZSBoP1OlZnfbbQ8= 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=GeNqFdyc; arc=none smtp.client-ip=209.85.128.54 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="GeNqFdyc" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42cbbb1727eso31943525e9.2 for ; Sat, 05 Oct 2024 13:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160489; x=1728765289; 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=GqRwvqn5MMZIilIwb7m5L2Gv05WHBymSS5m9I5855dI=; b=GeNqFdycZoot+0OiijC2XWp7Wgf2xlByOeV0wplqFrHvsphieWV3ZEmEijq8+mPXGJ W2RpcbrFw8S6JVj93dJzrxkS1KcMeKANE9+eav3FBi6kA7FWb9kjftR/WpZh9kfSAB+6 FSc0ZsSE1wog73w6flyCqicjgVIZJnr9YfnYZj8t1UEdUdj2UnjeB6+s2/TwX8f02fXR h9J3mZHu9oLAYf1ZC98qYEXEQ+Ens3gBmbbX4/MBMnhhnF3bS2cDXkqyWG+MjT4hTqIr HyuXINbRsseWPoe11kjBXz0vN0XelqHic/3QX9BRRwSWgnwanKEi7FSxagJoMFVo8DyR KMwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160489; x=1728765289; 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=GqRwvqn5MMZIilIwb7m5L2Gv05WHBymSS5m9I5855dI=; b=MI/yBNsN8pnV6bcGTIQZyeGlduj7605TyOyDogAbfiqQYKjM+a1WgCpeMw6hHSNCYM eucGy1C4Xi8Yj/UYjE7tgn6MokVIX7AhL4jSocDlnr48b7XBuORsL9C+Dvs1+fQZCdOC Bdv1ixlcco+89c69TiJJm9qYjQ0zh4x441Owvy0WAL38zaWZ6elp4Yf6YY2IPK/Rpvn9 yuyyrruZAxrMCreldFbp30bCaBLBw2wmF6Pgcrow7+GKWZtQIaDAl63lKVr0OGkHZKvU qdZmlTzagzi34AU9GddQJoxiFrfgCkmDUhAUZsOd8kZpOKoQfAK8ZIkAb1VfBIkvNC2R A6Qg== X-Forwarded-Encrypted: i=1; AJvYcCV1SJNJdLryp8jgtkXBx8INOpYbqfrOdwUAYN4sLaxSWHuhdWYt+2wnCwGWyA1gCdlUzicG0b2BCv2IIbs=@vger.kernel.org X-Gm-Message-State: AOJu0YxyK+jpC4vxIK4JdMx4P7vQLxCDbAyjLov7Bk/0+KNqyS4wMoYV AR9gp6NlKarD6Zqx9p7e8wXFe6QZFVkfCBlVh38iCAjAZx09sk1yQBCRzS0q X-Google-Smtp-Source: AGHT+IE9xG3NaWlIuTacg005sDJLyBO3bfMPTr7DCrgTYFT5Ui7ARWgCZ3y9M0L7BfUgJEzvAjwmbA== X-Received: by 2002:a05:600c:5116:b0:42c:b80e:5e50 with SMTP id 5b1f17b1804b1-42f859ac1ccmr58124885e9.0.1728160489047; Sat, 05 Oct 2024 13:34:49 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:48 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 03/15] staging: rtl8723bs: Remove function pointer free_hal_data Date: Sat, 5 Oct 2024 22:33:46 +0200 Message-ID: <455b7a4645e6652815020635a7b34e56c2b96423.1727966761.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 free_hal_data and function rtl8723b_free_hal_data as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 ------ drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index d9121e13fe69..983218cdbfec 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -35,9 +35,6 @@ void rtw_hal_free_data(struct adapter *padapter) { /* free HAL Data */ rtw_hal_data_deinit(padapter); - - if (padapter->HalFunc.free_hal_data) - padapter->HalFunc.free_hal_data(padapter); } =20 void rtw_hal_dm_init(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 33ae1ae51a30..867021ed31bf 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -439,10 +439,6 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *p= adapter) /* pHalData->H2CStopInsertQueue =3D false; */ } =20 -static void rtl8723b_free_hal_data(struct adapter *padapter) -{ -} - /* */ /* Efuse related code */ /* */ @@ -1827,8 +1823,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->free_hal_data =3D &rtl8723b_free_hal_data; - pHalFunc->dm_init =3D &rtl8723b_init_dm_priv; =20 pHalFunc->read_chip_version =3D &rtl8723b_read_chip_version; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 40383d3cdcef..bc2696f23085 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 (*free_hal_data)(struct adapter *padapter); - s32 (*init_xmit_priv)(struct adapter *padapter); void (*free_xmit_priv)(struct adapter *padapter); =20 --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.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 56AAF161901 for ; Sat, 5 Oct 2024 20:34:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160493; cv=none; b=ib9kbwR1OthPOtYGIm9TpDBnjIk7aBzJYRV280teEE0809JbDzAL+mkDEHji9lf2pMT2zyRtzHHf0CSkSFMdhxOO26CGd+yrrH7UO0xYnaqEr9IUyEnpEjarX6lfvc7ONpdT0i6e+/aeV7NQsVhFgnp+56r8arXSmrgS0HsC+d0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160493; c=relaxed/simple; bh=6w4gp3GmSJn+oIpsBAPIJ/LWbaB+xt3M0uQbnYqnCog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ritnnEg7IPoAFBwmYPbZRNLWH+fGcOCdwLABTvIFmAfSucKJ3TDPYeF4NBN2DACHnUteD/PAWdFEQm7/WqNx+eas5JZ2myE6xoGQAMU+u3/EVY3Z8E/SnCFy8VNAeHYD0wg/s0stxZ55tVGmfzTECezm8LHFNrmNhRz86Gx6tTc= 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=XhsNH5Ir; arc=none smtp.client-ip=209.85.128.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="XhsNH5Ir" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42cd74c0d16so31677935e9.1 for ; Sat, 05 Oct 2024 13:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160490; x=1728765290; 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=MFpoihA3emnfB9/dxfqMbKVK7yB71LAzW+Wo8COlZSU=; b=XhsNH5Ir10+rvBOwHhUpIWtnxdTW69BQgxJ+fYkdTrFCafF6RPrDQoR8aYwI3r/Bz6 NEq/aXvZW1x/bP++plqtFziY6ZlFtw+3NHR+MaMWdBpYLEFWFxG4UktCBCXgFk39qlXa sS/gWruatrwmqKsi4pq229MTJcIcUrAMfw4YVO04mz63Q3QyVRF52w4CpO635IHwka7g J6JK1+4m8MFTZXw3l+5S9Yj1S1UoUU1oBFKHtMtIZO+M0Ov8lL22bk5LZY/9ddRCU/zn Ta/73tv+sHQhQvveRysRcsigqmkw/VjiVtvSUWExLqStdSWMYWDIXuAllvYu4x6K4XUn QVyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160490; x=1728765290; 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=MFpoihA3emnfB9/dxfqMbKVK7yB71LAzW+Wo8COlZSU=; b=ny2Ysjf4t2W9qFMCH32XggnpVCRZzmWyuy+j84d392o7BGw/mQsVCMpncelvMQ2BPT knNjMMrK+5ihiKPXvDSdESQ4FzwLHvO4mSyt1qrToMK0STZ1QkpYsm57+8ukgV9so/Li dRFhUDThLTtepL2IAB/R2P2KXh5N27Jy+q9lNXE+f4cp6njsCWnZNnoQhyDmbXqDH1Mr Vapjz/baAKzl23oz7t6qEpb/m1U9MshoFuNjC3nFg+EmR+DGGqwW1SaSestmkzFhVaSo 3w7MmTuVFxGxKO4XqSTWh3HKGtpEtSnL+RjOFMMcqlH+wNWBi2N/+Hi+mMnS/HRN4mW4 luuQ== X-Forwarded-Encrypted: i=1; AJvYcCVCtmBEwklM/XBi8svBdxyHFpoH40ZwI/AMsnBda8EuZA8HSEtKsuDmGionHIbsB17yVIvgdUfk9DKQrTQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyimYSA+bZt1FJ7wdXM/Q9e9EIZKZ+OMUzj2dpusTnyaGCaCObR 4zCOeglakB/yhAQmfeeoZZ+OHwqaT7sYPQqqOG5LaSVHYMTmZu6D X-Google-Smtp-Source: AGHT+IG4jMAD2sUZ39zcTYHff6YUDHkQKynv+ec9fDPelc35Tsp+bFM137K1XrbLYH5xU54VPFzvfQ== X-Received: by 2002:a05:600c:4fcc:b0:42c:ac9f:b528 with SMTP id 5b1f17b1804b1-42f85aefd2cmr42207465e9.35.1728160489622; Sat, 05 Oct 2024 13:34:49 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:49 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 04/15] staging: rtl8723bs: Remove function pointer init_xmit_priv Date: Sat, 5 Oct 2024 22:33:47 +0200 Message-ID: <322d2412d89ae384365ec1d000bb0fc62128a261.1727966761.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 init_xmit_priv and use rtl8723bs_init_xmit_priv directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 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 983218cdbfec..1d1e4f438e7b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -220,9 +220,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct = xmit_frame *pmgntframe) =20 s32 rtw_hal_init_xmit_priv(struct adapter *padapter) { - if (padapter->HalFunc.init_xmit_priv) - return padapter->HalFunc.init_xmit_priv(padapter); - return _FAIL; + return rtl8723bs_init_xmit_priv(padapter); } =20 void rtw_hal_free_xmit_priv(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index d7941fdf42e1..55cf827fc255 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->init_xmit_priv =3D &rtl8723bs_init_xmit_priv; pHalFunc->free_xmit_priv =3D &rtl8723bs_free_xmit_priv; =20 pHalFunc->init_recv_priv =3D &rtl8723bs_init_recv_priv; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index bc2696f23085..696a71c01bf9 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 { - s32 (*init_xmit_priv)(struct adapter *padapter); void (*free_xmit_priv)(struct adapter *padapter); =20 s32 (*init_recv_priv)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDBF51662F1 for ; Sat, 5 Oct 2024 20:34:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160493; cv=none; b=jfffHXXeSAsLpUMw6f2zFSymxRa0oGOuc1ur4h2En2UkdmnPsbrTN1mp9/Qb2in2tUJxf4skPsJKaLQWRhswRY1MdIhbfz1xGqZ8F9qBjjRyg/CTCtwqeNRR+p1EXu6+9Qbr5BGFsD0802fdBQq43MkMYWaGE1pJCRTLMVz47Yc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160493; c=relaxed/simple; bh=TpQGa5ra8SvXLVOyzl0JFjYveChuJ/zm53KUwg/ByIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MUp2TF/OaNY8I9XxHJ7a6RVUvOe8SCwFR/ZEvKDnlA6YC+UAvcXqcHo72MRfxhw233+ULdfM73OUlcRVRJk9i8IjdzzkYXU52NJlwqV7JCuWhd/oogNj7hCsSFLVzbfDUyxVqGgf0s62gmWRcVR7mPduyfKY8lKNm82CHkB8rJk= 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=bAAiCwx0; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bAAiCwx0" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-42e82f7f36aso26837905e9.0 for ; Sat, 05 Oct 2024 13:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160490; x=1728765290; 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=NTJ6ZMxD1+jB403ZdV13gEam1qNwb5U1WYSGSXkZ//o=; b=bAAiCwx03M5wJmHFdtlBWpv1n6zdelwvkw4S6mPGPmvXk9AvVujKZc24UIBOJnaMYP G/Tlax2laPFFMIZgBu1XuqXhzQKul8Yd3wPLxNNYHPxY24mWrUMcWhjGto7DZZ/2vVQB MyOGJJJ+z2wpeJ4JluiOK+G7pqxZYw1QQAzixiDIv3aRd/Nnj+gD4mPF31IUgOR1Pi83 /aC6MEp+N7fy1g0JOwM2AAGPMpkQT5Y0FXKuTUIlf2jeMHx17kynp2t29+cRnb1ZAOi3 /232BENzTQb98ma4GcwJftgLBSyTD3nO9g3RMYYZ0LaMEn9gxc3n9gVwEtJLE0Pf3NGw LEEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160490; x=1728765290; 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=NTJ6ZMxD1+jB403ZdV13gEam1qNwb5U1WYSGSXkZ//o=; b=iy1qgnN7fpIQxcaxt52auWb5/Cw8C1AHeFghv3qT3EtlNuPiAOqOR0EtT31kJ2qpgn JuguI/1z+knbSxC27oR/r1REkUSQbCE4Oq+IXz7mU2VrpGeuw7Fe/XXc5B4OWyuU0nGV IF4ndLuQhaluOYKac2ct/DL4Wc4j2pw4f27GdG6c9PMMSoD5LsUCbQXXGlw0YVsdhNlF jaHiXCZR67hi3ljpDd1mOvdTvKlbEX/jbqNmJUihK8e++D++niwm1oVp6SECDjzIacrf PYgKf6KnAEYMNVuaZxie3sRX8vBW9wh30iwvxKRnwHBy9ynJbQHSnv03KZnLlaqwfIkd viWQ== X-Forwarded-Encrypted: i=1; AJvYcCW8pgCtLLC3uOlC28sK9UIww3Kpf89Rp4phZBHyXEePv2NqavE8gk6Z6H3hEBb6Vyh9WEIgwVpNalc0ob8=@vger.kernel.org X-Gm-Message-State: AOJu0Yxil3YFrM8YIRnMzTTBXeFUh9dTzGWXyGk8mWWY+pD0gxL2s+Jp Ctaq8o6PjOcV97q7OgwGT3F/nXVDNfNaCXPPbhDNC+ix18Nim2Zi X-Google-Smtp-Source: AGHT+IEBGRzD+6PW+UmhjSaUgcj6XEwk43MFvOUwqaFUyu64I9Bnl8stuR8amDF/ANROxkRpC+T8jg== X-Received: by 2002:adf:ce8f:0:b0:371:8a3a:680a with SMTP id ffacd0b85a97d-37d0e782737mr3700315f8f.32.1728160490258; Sat, 05 Oct 2024 13:34:50 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:50 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 05/15] staging: rtl8723bs: Remove function pointer free_xmit_priv Date: Sat, 5 Oct 2024 22:33:48 +0200 Message-ID: <01ee48c459ddda882c7616e6cf257d96429027c2.1727966761.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 free_xmit_priv and use rtl8723bs_free_xmit_priv directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.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 1d1e4f438e7b..bbead941289d 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -225,8 +225,7 @@ s32 rtw_hal_init_xmit_priv(struct adapter *padapter) =20 void rtw_hal_free_xmit_priv(struct adapter *padapter) { - if (padapter->HalFunc.free_xmit_priv) - padapter->HalFunc.free_xmit_priv(padapter); + rtl8723bs_free_xmit_priv(padapter); } =20 s32 rtw_hal_init_recv_priv(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 55cf827fc255..ef70ada68f2c 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->free_xmit_priv =3D &rtl8723bs_free_xmit_priv; - pHalFunc->init_recv_priv =3D &rtl8723bs_init_recv_priv; pHalFunc->free_recv_priv =3D &rtl8723bs_free_recv_priv; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 696a71c01bf9..0782a13074d7 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 (*free_xmit_priv)(struct adapter *padapter); - s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); =20 --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.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 F0DF216C6B7 for ; Sat, 5 Oct 2024 20:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; cv=none; b=edUVU+FRajHDkJzsoNINI/+wIvOgMi82torRt/I85g26fanhiliYA7+VNhIyGLgG1xjMNwbwf6mc/pKo/7dGjXKrtpGXqgFIfLaDMgEylXdMrGtrh9GJGQv2Tfx0OLGyaFgkB1GItkZSNR7YfzisnkggnfpMvwetGbVdkNC7KZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; c=relaxed/simple; bh=gLrtsrqCpd7Z8WUHzQfpHBMi9NhWsyCtmyG6Pga2PJ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EvRCwq4IEwN9IghjXWEaiJj3e/0t9kOCR5s1WPFTwJdLNYGF5wIo8QeQyihaD+q3Z3bO9ZuWjEbA0z2X/+PZs0s0lSHxUm0q7JsNtJrpBZJnCfMlJCbdyU2ZP/ptnA4eQToDbSY0VB9olD/kV1lnokArH+QyfNJdLz0mEqY2YZA= 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=aKf59Pl7; arc=none smtp.client-ip=209.85.128.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="aKf59Pl7" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42cbe624c59so26667935e9.3 for ; Sat, 05 Oct 2024 13:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160491; x=1728765291; 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=kRjXbGvt01b/G8SRxpi+wLxDhteB86SUXqAlnJOcBUM=; b=aKf59Pl7utMopO0yZYZKxOzPABFSAkRP4nmaRRiVYtlEiestaMYTSMD0HrOxcru4We BqtwQ0AX5PaTLQ8GT7GL+Xj9v6dNpfrpwlFHrzj1H0rfj2JWSuHBRoZJv1llGcelMl/j MeKOl8IzuI0gIMtJ/mYXt8qOc9SWGogqHC9stRfrmoPshZjuIQmtMkoAS4vKJ+afRUvt izfQvLalskQRUUiTZo5Q2YATIagG69TUfdwnTxl66lUdN/y06UapUGhz4TyIrVGpnTSS p+MnNy+Zs/SKKZCacd9l+6VKYYGKOQkn0ARTLrl6QXCqzuhzHlm+MYUfnbY8lvQSjcXq WVlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160491; x=1728765291; 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=kRjXbGvt01b/G8SRxpi+wLxDhteB86SUXqAlnJOcBUM=; b=HiMossXEiOI5ey5YulAccV1m9/m965VzwyFGRCSbtDLf01YksGRMb5EexdYF+SVG8r IY+3cokfPjrp3mPgy/2g+4PefZ8opnfl9RhdpriiZDQqPvDB9kUPT8kktH1IyWEhxzm1 hAPtnLyGFUIKtfXGB2DnohD/1lZX9EJhf1hR99FZc0566DXX4y8u/aTO5LLGMhckeT8m /wqFg74SNX0PJ4kj4BkSWoUSwSRnUdjaoSRnj30jJqBNNRmJmbqMyjWX6smnfieqBH6S dFnQ+YvBcCKjYqSUnBiieb7G/GEj4Jo+a7jKB3hZKMigNXETesEPHXSi0mt5W0JxJm+O TROQ== X-Forwarded-Encrypted: i=1; AJvYcCXQH73sLWWnL9TFiAly8pKgnFB5HY7pgYuCugIGU6ULCdB7WNwVzeBv4CJ0cTJeyw1vX8lYgfJlsIZWI8w=@vger.kernel.org X-Gm-Message-State: AOJu0YzpjgcNIhiKl0ORFuulvGyzy+kOFlnmPCO1EWAF9bQX2QW1nh7m U9OLNFNFpxGBNqg5b8UbxtmcHiC3vlbFf7O9+SRrd/tyyB3C4N6V X-Google-Smtp-Source: AGHT+IF0GyjFxjdin35AL8y+oEfcO9zmoloAem5RPoQ0Rp8dpbaN/OjTJGjHYf+nj+00PjYscEaD1A== X-Received: by 2002:a05:600c:3b2a:b0:42f:8267:69e6 with SMTP id 5b1f17b1804b1-42f85aa3344mr46591255e9.3.1728160490942; Sat, 05 Oct 2024 13:34:50 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:50 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 06/15] staging: rtl8723bs: Remove function pointer init_recv_priv Date: Sat, 5 Oct 2024 22:33:49 +0200 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 init_recv_priv and use rtl8723bs_init_recv_priv directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 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 bbead941289d..d571bf81ab2b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -230,10 +230,7 @@ void rtw_hal_free_xmit_priv(struct adapter *padapter) =20 s32 rtw_hal_init_recv_priv(struct adapter *padapter) { - if (padapter->HalFunc.init_recv_priv) - return padapter->HalFunc.init_recv_priv(padapter); - - return _FAIL; + return rtl8723bs_init_recv_priv(padapter); } =20 void rtw_hal_free_recv_priv(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index ef70ada68f2c..8d2a44726fc7 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->init_recv_priv =3D &rtl8723bs_init_recv_priv; pHalFunc->free_recv_priv =3D &rtl8723bs_free_recv_priv; =20 pHalFunc->init_default_value =3D &rtl8723bs_init_default_value; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 0782a13074d7..cc01b8d56498 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 { - s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); =20 void (*dm_init)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 7C4CC16F908 for ; Sat, 5 Oct 2024 20:34:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; cv=none; b=kAjTmR0mHoEobyL22IVlBAduq4XKJOx8w8SQF2EmUyrEhSllD1Sd7StJaDAjQMdpk8uOfNsAeEv6Aak3IeZkffHPMmVZiu8EgmRTs6wySPbHDFMlFkA9SrB6mTdJE6wJwIxcXyzyu3p8+Th2uNg3yAIS9WYcdxfAuYPeT6S2lYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; c=relaxed/simple; bh=Jm1rGgJTi+mCasyO4bMyXN8oeJxCKBSRh5MsXJXwyNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bny0spBPXHDmIbLMFo6Abz3gII9rbzdJn9pLdBRL0KPxNU1A5ZczM/OAlgqfhva8gpd23EuQF56NFyta8PrBBXf/7g68S6sO6kkts802eswOaWMnpS4raZ96kmCFyNv+za2qogoo6cHCWnHBYhwq5Qx2ymXiqzx/xvJPEgYCxCY= 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=j5zMzXz7; arc=none smtp.client-ip=209.85.128.50 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="j5zMzXz7" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-42cbe624c59so26667975e9.3 for ; Sat, 05 Oct 2024 13:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160492; x=1728765292; 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=/Wi+hIllgebzi4E1LyxylRUbiLWFw6eryMs3u2YRRFU=; b=j5zMzXz7CwwGDL/i0NtdotTsb8o0DowNqeA2XmB8N0i1gvBFPX5JeAEO6kbIfEtWax MUdPI0gR3EcEF9SuODkrTWrT46vlV3CUj4k3bYQL3LYuOcBB13mKgYbh7m7IrPJDqr0d 4VjMIjOYPaVuLhaDthQ8Lao/IpwCXlgoCgjuwOQJlUtClpNklV+pQknGwBd4vtJx1Cbj 5HFKjXUwPFY8SJre+5Cu/WPbdt4JVpLVsGkkY4RF8lmgfz6sF79GjrqvKWbJT54BQPZz pOs6Z8YyuKHANKPPEJL9quLKyDE4FETppVhhTkq9nHBh220Gev2VQx1glqSdSXbfdjuJ axuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160492; x=1728765292; 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=/Wi+hIllgebzi4E1LyxylRUbiLWFw6eryMs3u2YRRFU=; b=uBQbie9EQXUJltww6oHweRkFQZWsx+CiunDqJIBkcsinTfYT6KLF+Derq53IbjUFBv sZw8YSZNATTDvbM0c7bn3L7xdkDGljD+aQr7ZRJXYUjlfBZKH1ObL7zJsNNIiwDSdrZt 1iidUAMAE06j6dJbDRngdRs9H2oxwFwivB1EpJGPVZMZDuo1jb/fMoIU9d/+qAeHnKur 83LjUAU+LNsrPb6iwrz0d9YU9A3amQ+OuBT0Tbn2mZPrbRng6+qdbwcP6APjPxwTmePf bFg52Z3YLYrYjYuJoOo9RWxtYWU8DT+sllcFB+RwGb7ymnaOAGo8Qw8R1iepZ+Kr2Atk +/eA== X-Forwarded-Encrypted: i=1; AJvYcCX11/MguqT0nnxA0MKi50HVaVtaz6vxL7LDuqXQ4v4tm4dtTOpoRKgM/3KhCfymvMsCahbo/k9CR26NMSs=@vger.kernel.org X-Gm-Message-State: AOJu0YwCIRMrLVSlYGilyqRLatdmzjdB2VMbq67xtlMgq4bxVYq2aj1D Nzs1HuSQCmmBnZyT25WVhKV9EtkbI2LsbEQzSMPG7sPpjmMUZXEL X-Google-Smtp-Source: AGHT+IGk4Rda6bc641qDF72QqSR+3nlF1zPT8cTBSwlrSfc96+yP7+osH55oyi+/xpfK8NlP7gh9iA== X-Received: by 2002:adf:a198:0:b0:37c:d20d:447c with SMTP id ffacd0b85a97d-37d0e779f64mr4039355f8f.29.1728160491566; Sat, 05 Oct 2024 13:34:51 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:51 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 07/15] staging: rtl8723bs: Remove function pointer free_recv_priv Date: Sat, 5 Oct 2024 22:33:50 +0200 Message-ID: <17f06e3495abea1f6ad2a2f8d4f4ff1f23bef654.1727966761.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 free_recv_priv and use rtl8723bs_free_recv_priv directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.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 d571bf81ab2b..de7dfaa69c66 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -235,8 +235,7 @@ s32 rtw_hal_init_recv_priv(struct adapter *padapter) =20 void rtw_hal_free_recv_priv(struct adapter *padapter) { - if (padapter->HalFunc.free_recv_priv) - padapter->HalFunc.free_recv_priv(padapter); + rtl8723bs_free_recv_priv(padapter); } =20 void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 8d2a44726fc7..52cd980c2003 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->free_recv_priv =3D &rtl8723bs_free_recv_priv; - pHalFunc->init_default_value =3D &rtl8723bs_init_default_value; pHalFunc->intf_chip_configure =3D &rtl8723bs_interface_configure; pHalFunc->read_adapter_info =3D &ReadAdapterInfo8723BS; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index cc01b8d56498..ced414f2368e 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 (*free_recv_priv)(struct adapter *padapter); - void (*dm_init)(struct adapter *padapter); void (*dm_deinit)(struct adapter *padapter); void (*read_chip_version)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.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 EE848171099 for ; Sat, 5 Oct 2024 20:34:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; cv=none; b=Uu2jb9embX8TNTvg5OtYnJBtgHltumxocTtfrLBbLJ7iUkjW5brTLFK1nHvII/haA6bInyjsLChergZNhOrS3uqg4Xb5Z/qHB8ke7Z/QZlIcM8UY7jy5UnjitEW2+qb8mHvdgR5SFpjor6O6cjP8Jxd1LK8s5FTHgkiJSkDbRvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160495; c=relaxed/simple; bh=dabQ6fghBfIvhyifZzKyzwvT/xIYIhxb9K8PNzkevQc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SE/JyWOz+6jlj5n17mgVQhAun64E+k2Muv1JSQJdwRc4Ut7DmqiFKcw8JH+0QQfpUV5z+08fuiX4/n+yohFrm6QPcg4lSkw/MO622BujjxLlyNpyXiYN+MSxEPU7A7sSCdPYGRyKGmQ9TsLFed9DadvZEaqQJzce5J711OVRMDo= 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=PbCjZrEX; arc=none smtp.client-ip=209.85.128.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="PbCjZrEX" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so31782195e9.0 for ; Sat, 05 Oct 2024 13:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160492; x=1728765292; 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=dxnc96e2zL7BVq58lm7tPzStwCCg21M4KyRml5a1xEk=; b=PbCjZrEXVen8ENQTYOroVZpCHdvRnMVAgeYg1JdNtWOKFzxi1RsX2BHWZDMgzsQg64 HBUbmhe/RSkKPrJi7TG2d/ACcc74zR47Odr48TvJL4JTZcsQNxvWXL+b8mvSKuwbBt3w AFwTjd7jjH9HKA8AHWgJ0YXCWOuY1JX1iSlhTit7nYQZuSY5hnU6JponD3wItVrTvc9j buYBsu0Zaa55z2/Ogm73E0K9hme7USHuJhSsajQviL3whqsopd2ebBmm84PX8qvfUS0l MpUPfsxMnT8RCDMoI+QzUV/P0mZ+mOYR860Yd8DCPmr3TNFwTxk3CCUuOM41mibXypAp LEGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160492; x=1728765292; 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=dxnc96e2zL7BVq58lm7tPzStwCCg21M4KyRml5a1xEk=; b=cx40q/cYtXLjcnvzFoFQf+CaP9AS8Zo0OqG8dy5ukPlh0CFxzsF4GRALw3hG5QH7Ux v35reerPVvUlsn4DcceJ1g5WwfePfzrjkCZRj+Ek24pt0L3iU00d9eaDlkAX6fVToc8J bgjb0SUY8S+XcN/DSd6LYMzbTZ7zzg/jNtD7GThE3fxynPZMe3LtxsTAQogdishBvYqw JMdBlIeLRaeUY5YWZM7SzZElC24zejThnFyMFr/VTwgYH1SrA7YhQGN82lLQUD20M4B1 LRzlnWby7oArMLqzd8CR/8TSmveNMgUjv1j4w1SmGTpZci9eJjUNsCd33r+Ls4o+kP1i eocQ== X-Forwarded-Encrypted: i=1; AJvYcCXoRaE8P7mjl/7N9uLFhw+Aguo5DUv3RmKXi3eyNDrYHoEpYTQOAuwefa+0GbkzN06TpJ7dL+miQDxD1+0=@vger.kernel.org X-Gm-Message-State: AOJu0YzylSvJfQO3oZmrA3cJJBLIwJZEpfQUJpilaw6id+VScYsgx5mE OUXgTistToXXMDOO41dacgpFVl+VhNuu6Vfsz4wQ0Ddl4QAefIQp X-Google-Smtp-Source: AGHT+IHUweZibiPXVMd+Cs17iH023FX7ucoRIBL+3Nw87JOZUy0zoEaXpTUDzdFBAI8zmvbRKEHtPA== X-Received: by 2002:a05:600c:19c9:b0:428:10d7:a4b1 with SMTP id 5b1f17b1804b1-42f85ae92f4mr50982645e9.25.1728160492135; Sat, 05 Oct 2024 13:34:52 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:51 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 08/15] staging: rtl8723bs: Remove function pointer dm_init Date: Sat, 5 Oct 2024 22:33:51 +0200 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 dm_init and use rtl8723b_init_dm_priv 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 | 1 - 3 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 de7dfaa69c66..760ba45de8f7 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -39,8 +39,7 @@ void rtw_hal_free_data(struct adapter *padapter) =20 void rtw_hal_dm_init(struct adapter *padapter) { - if (padapter->HalFunc.dm_init) - padapter->HalFunc.dm_init(padapter); + rtl8723b_init_dm_priv(padapter); } =20 void rtw_hal_dm_deinit(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 867021ed31bf..106f1124964a 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1823,8 +1823,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->dm_init =3D &rtl8723b_init_dm_priv; - pHalFunc->read_chip_version =3D &rtl8723b_read_chip_version; =20 pHalFunc->UpdateRAMaskHandler =3D &UpdateHalRAMask8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index ced414f2368e..8b85baf5be92 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 (*dm_init)(struct adapter *padapter); void (*dm_deinit)(struct adapter *padapter); void (*read_chip_version)(struct adapter *padapter); =20 --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 C89C3172BCC for ; Sat, 5 Oct 2024 20:34:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160496; cv=none; b=fOrwIs8qO5eUK2G9pL95PylcENneCl1poGuVNr2hSSTd65QhFfkBIl0oZm53aofZ7VqB02FAfRzkZXjijli+K2/NqprM4cNV5C7IjZ5yV0drSYEWT9xxWYxu739jMwjuzkjiYi+K/3NihlQU3vnGWsZD3qZDyG8Wp5rnkMnQR2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160496; c=relaxed/simple; bh=+o9bNAhuCTEeX/3tRLMGovUGCUWHMeoJSUHhd+GvWXQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QRfc05ckOOWqULScfdaXJU4PPlFEwNTkMiWKKcAoZ1jAwKkcotbrqjyQ2G0LM49BaWvG6IFtDNKLeRhpGp6xthj0QESSE6FGvZ+90Jgk0jjZPi1hYSaxi6KJyEhaF8X3VoU1ysVKMgr+gfwWlnQsIFab7jk2lJSplccNI3GaLD0= 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=cfPIAh1M; arc=none smtp.client-ip=209.85.128.50 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="cfPIAh1M" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-42cbb08a1a5so31601275e9.3 for ; Sat, 05 Oct 2024 13:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160493; x=1728765293; 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=tqqVa0m0IFUn28jRHH6DKcrgM36B1YpEymuOnaGzz64=; b=cfPIAh1M+F0m0NkzMvWhz6Wjl1QspRDXQt2wnoARAbwTnIAIeZ/K2M/nR6i6W0pfYm Z5XYzkqYR5EG9iNlm7Wp9RwgAwBQpgFm0gk33LUqWPPILt1p2vBqx+pOYTxge015y1hz D6jU5PG4X/jmUW80N9fanXHr3zuIGUPNey4kb9Y/AsO2kiDYfPPiquOpuEXpFlQuJRyB StjnCsTDyiL+/WYX3kwPc0hyt6TLNaFosW7zfKmkoZ2thhQ4bggZTQhDHXnwdaqyFmxl gXfv4K/zVUGOROktY27eRZ1WPkp22RaodN491b6HBbDdcOCYIf2JIQHe8LbAMXHkwAYg 7tlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160493; x=1728765293; 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=tqqVa0m0IFUn28jRHH6DKcrgM36B1YpEymuOnaGzz64=; b=D10olvuorSJb3XHVIAMx4Jp02XupXq1+qzvl7aWsaUkuLbl9gjyy6ayBjYQoYhQbiP rUFOzKLNCBzHHgNvs9rEaMJp0l7VKuouuBRfQbF2zS4DtswmIuQuJrX12u9p5YdojkYF xqyDt8oL1ywnkDv3HyOs+NjcAsiKYCrRohc0Ez52wabVVpVjrRxMBQDFDP4FenKTQWlz Ebjc0hPhY3xs+pF62HnjwUUXAa5cPR0VlSf8zwOFgYo1LmpyTb2d6Tqq2xea0nPWS3og p8uaLZU5XKvEWxVGNQxc2H7DPm2stTBTvETIU9poOCFL/kvETuWIoeVjEWBgqt7yMVPY 8j7g== X-Forwarded-Encrypted: i=1; AJvYcCVbvBOX0euAVvZf8PI0gDhxSYJGC4glD8MWn+5/LOJNW19yWbWolsLlOCLIP1TQKBcUmBd+AxUtBBcja1s=@vger.kernel.org X-Gm-Message-State: AOJu0YxUVlNomiJ0GDauaK9RUQwkbtqHH+nojK75e5C6MQx44ScylVXy kbr7U5PbbMXkqmtKmEsRBEj2cltt0EYgd+XcjwH+XxDFx6eCwS3E X-Google-Smtp-Source: AGHT+IEyD1wqT6lfw8915OfOpCipvt1vQBVN/4QD9b8dH5y6OQJneRi7TsjPO8yLUIo5COrmveWLbA== X-Received: by 2002:a05:600c:1d04:b0:42c:a802:540a with SMTP id 5b1f17b1804b1-42f85a6c655mr48721155e9.7.1728160492875; Sat, 05 Oct 2024 13:34:52 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:52 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 09/15] staging: rtl8723bs: Remove function pointer dm_deinit Date: Sat, 5 Oct 2024 22:33:52 +0200 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 dm_deinit as it is not linked to any function. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 --- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 760ba45de8f7..451f54e5de09 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -44,9 +44,6 @@ void rtw_hal_dm_init(struct adapter *padapter) =20 void rtw_hal_dm_deinit(struct adapter *padapter) { - /* cancel dm timer */ - if (padapter->HalFunc.dm_deinit) - padapter->HalFunc.dm_deinit(padapter); } =20 static void rtw_hal_init_opmode(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 8b85baf5be92..6d301b44fa23 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 (*dm_deinit)(struct adapter *padapter); void (*read_chip_version)(struct adapter *padapter); =20 void (*init_default_value)(struct adapter *padapter); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 542EB16F265 for ; Sat, 5 Oct 2024 20:34:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160497; cv=none; b=daFvflwL58gsC+Qw6WYLvArGG8JpPFra848sZOBcO3WAi/Ta9tfUiXsBJSs/ArSxcuqB0gC9DwSmbBoA4RUBbd9GAmuHHIriJ0ynLYlGW0cxes7prNRZeCK+46fPwJBlTa5jegnPynLC4SunI8OyweJfXfUd2yiKYw6rhZuxU/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160497; c=relaxed/simple; bh=q1+I+qi7RRRKyj37zYDmCgv6DDuGIALnITv4DV7u5uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XCe2BGuz8b4e1ZNZOVwKyoynINLg6YashiQWC/zHMw9nv8tiIqsGRZI0ppmP+S+EB1E6Rf+PWShCwBd+eMn8AJ1a94obMohlfdYjYgddysaxDKTLetk9TYGqgiANndpKJEWxhQwFfTmyLHPdct+pmopueWcNzsGzDEIrZwrnFWs= 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=SqlH8SN5; arc=none smtp.client-ip=209.85.128.54 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="SqlH8SN5" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42cbbb1727eso31943965e9.2 for ; Sat, 05 Oct 2024 13:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160494; x=1728765294; 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=BvdqAIcZmdVsn+BXaPIVAuslbQWY2fWTXE+bajsMN+Y=; b=SqlH8SN5Khz6pyBs8hsUZdy2c3PqjaQwvDj/PnnQ4L64KEnkwSj7dsxyEKx90XsGyO qlwO2sg1ivn/LNAU+KUUaSs4XTZg45+axdJZcTMmWy9VtFgCZzG/vLbkrNrCDHiwvbIC DHD9z87UbIX6+sCx7Yzm42GpFuijQLIN1Cp/2Fv6rQ7NhPL/SjOLdikdbPmIy40hSij6 3Gybeyk4r3uWRWhIB8YBaLNsD+xyPwViyZs4MqV3zUBWYJwVvDiIo+6/eNatPanM6pWa pFnW+yG8Q7q4eY0nbHpXY9pif6cvuisfCZWSHi66jDyv5IJAF++Sv92xrZ7/tQAhCvZJ uKQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160494; x=1728765294; 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=BvdqAIcZmdVsn+BXaPIVAuslbQWY2fWTXE+bajsMN+Y=; b=PX4lXM2hWICG4leFkEIz1VxA53CzN+avnTLUqBxMhN2sdjac6tyOhTcA3NqvcEe659 o/69iucZU77ZJvIukS26kOq2qoBIG/+bDVQY91zgI88S2yL5qRN5wNz0yyGHfXHVtRQ0 21dLx2+QQ5tS2vDglM6ltqKB4+z3M2UeWXUcS1SGuSEkN3LHLwYcAtTV9GulZ+ZiJYnz elJxMHEqKU97GeSgZotj/mdoZL7L5A2V6ttfRk8M4RX2Imo+S6ZWpUa5RV6d7sVsywVJ Nt31OMoSpIllR5qNKOz8g9ul8aUnv+7i6uc5MhtXm8V7ui7bcs00ODeLs88mMjSVVzMw +ffg== X-Forwarded-Encrypted: i=1; AJvYcCXBWa2ZAkerhasT1x69SppDDaJfperLVkjWD3Z8DsNcyDqN2LUskDNi+n6k2qkE7uROEljZ2+3B1Tx0Umg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5Uwqi+uZZNWczhuvjyg7Bu0NACJI7tybVr3/i46xvvvODPYfk OPoF2poqfnSS4eaJOigay+eoo/RfAGobLG+AagR4aFAgR+RtIr4CC5ZXB8k+ X-Google-Smtp-Source: AGHT+IGd91FqCQuN6SxeWzAMZSzwcbIs+051hxb67ZpDNIiJuwkmWU9pxfg2WqSf2VJjdy7JbiZYDQ== X-Received: by 2002:a05:600c:3ba1:b0:42c:bc04:58a5 with SMTP id 5b1f17b1804b1-42f85af0e48mr53707005e9.33.1728160493453; Sat, 05 Oct 2024 13:34:53 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:53 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 10/15] staging: rtl8723bs: Remove function pointer read_chip_version Date: Sat, 5 Oct 2024 22:33:53 +0200 Message-ID: <79b26478a2493a1d7c27f8e88e0bec56a653d082.1727966761.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 read_chip_version and use rtl8723b_read_chip_version 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 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 2 ++ 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 451f54e5de09..8c80e0735840 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -21,8 +21,7 @@ void rtw_hal_read_chip_info(struct adapter *padapter) =20 void rtw_hal_read_chip_version(struct adapter *padapter) { - if (padapter->HalFunc.read_chip_version) - padapter->HalFunc.read_chip_version(padapter); + rtl8723b_read_chip_version(padapter); } =20 void rtw_hal_def_value_init(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 106f1124964a..578e8ebf07c6 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1610,7 +1610,7 @@ static struct hal_version ReadChipVersion8723B(struct= adapter *padapter) return ChipVersion; } =20 -static void rtl8723b_read_chip_version(struct adapter *padapter) +void rtl8723b_read_chip_version(struct adapter *padapter) { ReadChipVersion8723B(padapter); } @@ -1823,8 +1823,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->read_chip_version =3D &rtl8723b_read_chip_version; - pHalFunc->UpdateRAMaskHandler =3D &UpdateHalRAMask8723B; =20 pHalFunc->set_channel_handler =3D &PHY_SwChnl8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 6d301b44fa23..9b0e9c0bf020 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 (*read_chip_version)(struct adapter *padapter); - void (*init_default_value)(struct adapter *padapter); =20 void (*intf_chip_configure)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index a108ce89bce4..040c9af06eee 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -87,4 +87,6 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter); void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_st= at *pphy_stat); void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe); =20 +void rtl8723b_read_chip_version(struct adapter *padapter); + #endif --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.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 D4E0C172767 for ; Sat, 5 Oct 2024 20:34:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160497; cv=none; b=tWPDA8u/BPOmmrkbdrWbLtjRD5xE3a4m8bZfQDeCiN12PJ60qQvV6vPie07JZfCfN5TWfZAgPu9urETBXUTKvtUg5TzLTbhfup81zQtrM02pAM+XKs7A/WOBGqsTJh8Qm/yAnmL/PTNnOQe8Tn7IbfzrLNDJVasGN0OjpU6Iybk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160497; c=relaxed/simple; bh=DzFsjrR8uTSsexoZFECYdKO5oEoK7H7WulDYsnWyGUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fsKZTek9cJNINFoVmE3RIzYKM9fHFPLH8JSkKubKBhD8qDmcdC+OVUkUJR4FHmVjAS2Dy2+oVn8MtwjPCQhcTFtt/ShJfBc8RAIA+GaDnxavxNtPVJ/d25IzWg6oExE0Gks61tMZPMYKxl/hKrn9pe/bCLzup5aaRaCpM5XcP10= 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=NyK/DeO4; arc=none smtp.client-ip=209.85.128.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="NyK/DeO4" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42ca6ba750eso19279735e9.0 for ; Sat, 05 Oct 2024 13:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160494; x=1728765294; 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=0q9mc5Vxi135rYPqQgMHuHAkwJUcyR7fvEbuN9Uzyy8=; b=NyK/DeO4cTPImL7MBCY2ZKcnOdzPT+kcJg6A6/xfOmJ//7GCcBUCAzbkuhZyZXh5fb MlBye02rILioD/4eTFDjYpLn5C4XNno03afvp4JGga7W85Ww9Eu7qqqh8ancS1YuzRGU Y7Gew5hFbIN3TMz2Hg9cTdCbJm0qk4ZPM/YSPBx0n3PyxN6Q8V3bgG6XnY83e2mIYPQE 72u38eu7CyO+YQc5uZrXQ/U+ECgThA3ken9GZVi/MczyD4+vPpMTEHGJx1dvzd8LUHrP 36pbgbd30guZtJKco7FCL0xMjhVO0YaKoMeL28yuq8H5WVckhc/0a1FvGghMS+x0DwYz +gww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160494; x=1728765294; 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=0q9mc5Vxi135rYPqQgMHuHAkwJUcyR7fvEbuN9Uzyy8=; b=g406x9W52t8qyoCZNLfkwxeWu60JwhMzGc6kraptaB88PYBRl93DrMy3R+4uQSLWqm LUc90um+K43rbZeCHCavOOxwDk7S9izrGVfJJlBrenPj1AkhBDSnnXJl7e9kWiZX/52v O+UoTVjuvjryOz28teqtTmJrXKcqyi9fyu3Bb7Yf2g+wLetiE9bqi/QzZCKuDZ9XlgZB Faohfrt2lC6SFrCLOs36GSIXi2KLtDZBwfwHiqU7dsR11dlDsN6jDJ8KbT2HrL3UHay/ npbSl1RDUFWN5L4SNm/QfXM5h8dUwlr9m4BCBtuYjyD3QwujfvJx1dVa9qvITHktfhUz n0Jw== X-Forwarded-Encrypted: i=1; AJvYcCXbvzMVV7i3Qmq61n3/+N3iSQoqctHx70keop+FBLpkTwSsg6fRzDzYNRjvuLdTIBq/KJtFPXBQpD2Aa1U=@vger.kernel.org X-Gm-Message-State: AOJu0Yyej02+P/cSuOD9jRjkNWBYJyeyOaqpDZgQpSjneY/DeqVsoA5C Z1i33eZLu0RS7eb8kLAOvgFHHysvstsr6OQ9NEUXW3a+8lGhvYsbhgBXUBxH X-Google-Smtp-Source: AGHT+IFb4ZE3CnE17gYQ6TuhVGEqEVW9uNilRK7jmt409cBGqXE8EHg7yYucFhBpiBjNuLlIk9TuDQ== X-Received: by 2002:a05:600c:1d1c:b0:42c:b697:a62c with SMTP id 5b1f17b1804b1-42f7df1cffbmr71784345e9.5.1728160494059; Sat, 05 Oct 2024 13:34:54 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:53 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 11/15] staging: rtl8723bs: Remove function pointer init_default_value Date: Sat, 5 Oct 2024 22:33:54 +0200 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 init_default_value and use rtl8723bs_init_default_value directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 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 8c80e0735840..bcbc9ea78951 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -26,8 +26,7 @@ void rtw_hal_read_chip_version(struct adapter *padapter) =20 void rtw_hal_def_value_init(struct adapter *padapter) { - if (padapter->HalFunc.init_default_value) - padapter->HalFunc.init_default_value(padapter); + rtl8723bs_init_default_value(padapter); } =20 void rtw_hal_free_data(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 52cd980c2003..236effa5c96e 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -937,7 +937,7 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter) return _SUCCESS; } =20 -static void rtl8723bs_init_default_value(struct adapter *padapter) +void rtl8723bs_init_default_value(struct adapter *padapter) { struct hal_com_data *pHalData; =20 @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->init_default_value =3D &rtl8723bs_init_default_value; pHalFunc->intf_chip_configure =3D &rtl8723bs_interface_configure; pHalFunc->read_adapter_info =3D &ReadAdapterInfo8723BS; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 9b0e9c0bf020..357b41894cf1 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 (*init_default_value)(struct adapter *padapter); - void (*intf_chip_configure)(struct adapter *padapter); =20 void (*read_adapter_info)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index 040c9af06eee..69b5a7df32ad 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -88,5 +88,6 @@ void rtl8723b_query_rx_phy_status(union recv_frame *prfra= me, struct phy_stat *pp void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe); =20 void rtl8723b_read_chip_version(struct adapter *padapter); +void rtl8723bs_init_default_value(struct adapter *padapter); =20 #endif --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.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 4C0DD176FA5 for ; Sat, 5 Oct 2024 20:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160498; cv=none; b=I+3JqnJm7cZQuV5mbW1SgHj6/Nie4KEiBiLsmU/ghmgEFIXr+THMhWutuJwPZYpUWH9Key5LC6b0PB98lHJQcY/nqyDrWxOsNKJnXgseI4W8+glm0btVelsqyYquXyYdEWvtJ6TESsVbfTtQamGrqZaSqfKCZbR82tc8eUCkiIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160498; c=relaxed/simple; bh=krpq0fGgzMVWgb9E7YyRR3doZAOwCWPNy5qDRMYUCGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bXHyUOqpeqGXzXeIECfuFbCvSyGPGv6QfahN6+U0ipQLPz8S0lXupNDyeH8TNovor4VNE3wcN3XjY4larN/gr+QuSdqAIeZ1J1qe3l5fNFGwI2sQdWT//NSKyyCaq5dCTNtOoy1XMveXRYctY+BlrueUv7p5qWMu9fFYVc/q9vU= 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=TKRL5o2W; arc=none smtp.client-ip=209.85.128.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="TKRL5o2W" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42cbface8d6so41378995e9.3 for ; Sat, 05 Oct 2024 13:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160495; x=1728765295; 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=7spXH37LdfeWovbaJGZA+/T7zLQ1/vnpaj40rcnBLOA=; b=TKRL5o2W8ah3xznY6aEuG/YeCfoM+gshngXCufhAhQGIhAGcDdXvHtvWNEeoIeuWVG RDR5ZmpcgLMXE2XQlUZyPqIAJfO5pBXrTMKkyidDYaNNOKuZriaLto7+csPH6kqSf7Ui XpBN4J3Qa3ZUUyAc19gsxtJIyn7QfI9d3UpnSL36AXofsCH4WLus2hPOE4qXNInJ/yC7 wp1yjoGlzV9vKPl7CIckGBTs7bJFMCb9+Tm6jBn6A9ClHILLegIL9pcWVZ4Pa8B27K3H dXMZ33Eu4YaAKb99gDyKY9P/EyCrZ4Mw6WgDUcQJay2VWKahav153OIAW8+ALkf7D2DW KS6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160495; x=1728765295; 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=7spXH37LdfeWovbaJGZA+/T7zLQ1/vnpaj40rcnBLOA=; b=e9C2jhNtLM8o4R6fdC4buMuWAa1PkVW+Jm0BGxa0JzxwhI8pt/PgyExadVz2Tj4IPK MuBCoKesmEzRL+90RX/yUBjN3ZmdHEvVa752/4z4yYZSCAQ59knBQeemgV4GDLMP2taO gdLGOU71wSAIT8tnkqmAmDfU76pkdibjEcBEo7hS4n89BWJMczdLxYj/739K80+dULC7 mMECjIVGseTPNQeG0wUETXfzGWFBW8L8SKw7i7/YyTov1s20cjYWMywORrkg0mk33aQE QdghB6Z3duxSfNCNEuGbUFsWTNIaT8spU/hSi/wLt2zk9O0FiG6AXingwGxlpeRgRf23 9g4w== X-Forwarded-Encrypted: i=1; AJvYcCUfdUfj9GHOQdPOZYvIdUuP8FPxlFdklRD7OgbiTCCaCXpnkzGGR1ciJKpP5kal5HmHnWn4WoNwWrcIaN4=@vger.kernel.org X-Gm-Message-State: AOJu0YxXIS3rLLB9ntBhM93evT8GokFyNpJPcHoOB0SSpsaE5IpBASXx rC43p6atepLRlXDNb7YHGyE0OAc8NG/UWYK3tSR0xtN50tzFL5xh X-Google-Smtp-Source: AGHT+IFj9oct3wT0jweApImNO0BKJKKyji166TK/fx62TwVKc6IIDyUeFVLl0R7cRhYgl52V07tcYQ== X-Received: by 2002:a05:600c:3b84:b0:42c:b8c9:16b6 with SMTP id 5b1f17b1804b1-42f85a6e0cdmr69418835e9.2.1728160494628; Sat, 05 Oct 2024 13:34:54 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:54 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 12/15] staging: rtl8723bs: Remove function pointer intf_chip_configure Date: Sat, 5 Oct 2024 22:33:55 +0200 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 intf_chip_configure and use rtl8723bs_interface_configure directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 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 bcbc9ea78951..ec95d3ec3170 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -9,8 +9,7 @@ =20 void rtw_hal_chip_configure(struct adapter *padapter) { - if (padapter->HalFunc.intf_chip_configure) - padapter->HalFunc.intf_chip_configure(padapter); + rtl8723bs_interface_configure(padapter); } =20 void rtw_hal_read_chip_info(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 236effa5c96e..6a56a5db5a5f 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -950,7 +950,7 @@ void rtl8723bs_init_default_value(struct adapter *padap= ter) pHalData->SdioRxFIFOCnt =3D 0; } =20 -static void rtl8723bs_interface_configure(struct adapter *padapter) +void rtl8723bs_interface_configure(struct adapter *padapter) { struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(padapter); @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->intf_chip_configure =3D &rtl8723bs_interface_configure; pHalFunc->read_adapter_info =3D &ReadAdapterInfo8723BS; =20 pHalFunc->enable_interrupt =3D &EnableInterrupt8723BSdio; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 357b41894cf1..1932f93d89c7 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 (*intf_chip_configure)(struct adapter *padapter); - void (*read_adapter_info)(struct adapter *padapter); =20 void (*enable_interrupt)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index 69b5a7df32ad..dbd051a34d90 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -89,5 +89,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, = void *prframe); =20 void rtl8723b_read_chip_version(struct adapter *padapter); void rtl8723bs_init_default_value(struct adapter *padapter); +void rtl8723bs_interface_configure(struct adapter *padapter); =20 #endif --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.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 22275179967 for ; Sat, 5 Oct 2024 20:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; cv=none; b=fovhuPszRtYehmFjJvOKB4h/8aMezOsjnYjDNdQWjd3VNUjY80wCe6RAUJ3Lunq4w2wXd/6t4LLKxwE3/RrPOaww22ZiaqlSBTR7Ywt99oq6QVnLhc0cipxACh+ieooHY7b2dYtW6N0/HJlJ3vbDJPQFZaJ4CIv5+6Z14FAL0/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; c=relaxed/simple; bh=v/0CCal0XeJHTxlmTvs+auc6waxNoKMfAJtePcsbDrc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JrBn/rv5jdjMsRHk1DTC+dPV533aM0SKs1NHLVhs0WW504ohOhnzqxvAtdnoz4n0WkhZBOpNZc+TEp7GLIxbi+wMAK5YW/hV3YVWlCAR+t+TYfaaMtVvczcS9rPFUwZWE244cPJ9wRAsN+sHtskP8F6tyraS6V9fnLmyXmBhSqA= 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=PiBW5XFt; arc=none smtp.client-ip=209.85.128.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="PiBW5XFt" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42cb806623eso28061565e9.2 for ; Sat, 05 Oct 2024 13:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160495; x=1728765295; 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=ylO/EeDKWQv57ntwn5IyR8C+2g+4AGbXBkezjN5eRTg=; b=PiBW5XFtOuCKlRDQpRL06cVeeTEDzUnAbhju5EoNB0oCrgSd3PEs/8c5rWlIweUz6W vwrVttTp3U9/FC8s34T2bsnFo7EtTzHThtQTCW9XS9hTzKBMl41iM5JxGbtnqKoVa0UJ SXLpZYHvdwx9E9AwPi4Uw4HTDFdM1oIu+ShBkDSWmZURLv3Sf/eo1i8kAAOMgG746vdQ 5qD8mRZ8hiwxtNOaiNbPAh2Res60LO6FrjK+Y4j5STeyWpUrfHjwxduLrUfcfLjc7Wf7 4o5bf9zy5HNjg3BgakcArdPdmXnzjHb9bQELCRbRkmubaVpuY0AXBeQbsmHYo6q1Z5LF 8YSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160495; x=1728765295; 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=ylO/EeDKWQv57ntwn5IyR8C+2g+4AGbXBkezjN5eRTg=; b=bX7hAeaNPdJc5XgNKwV46gk+ZthSXCofT7ic8DumksD3Y+g3ZCHmpeS+ABeU4Zt+z/ ERxBGB2YNx6bMa4vfuKgbWC6LUAeK/Hm0QE0jJ1lzxxPwFyY2jjjfeYjjX/zlmlhav0u rGpSlCLjt/szCuk77cDbBqjXH5To0SBE7/QgnDhhBDW4F2lIDvBdD1XewmIhn3eyAyNH UThR36tV4YMfQhZHQjP2LyedUktnrnxznbwgHX3BoXTiMKc8yUQDaZn3h6GlwrMvUPHY 3ZEixOodt6xj/DispnLPgjKve/HCF2VCP1XyY1zqw3P6LPrXgEiW/CP2um+g6T938sPz mNqA== X-Forwarded-Encrypted: i=1; AJvYcCWRHmH3gT2hI1khq1839bT3cy5hjxeRJg5NrsMExEFEBfIvavjprd+avttPeLG1cYPWdXO4tLwFQhNpFb8=@vger.kernel.org X-Gm-Message-State: AOJu0YwJxNpgIOP7qxCNNKaROwECPtQqNB/tOyslgkgGEEOny2kMqSg/ 41AxSELIaP2tAikTRl5SNKaZopRJsDcW+cZGw2sGA06qLM93vnLO X-Google-Smtp-Source: AGHT+IHvJeJsMbNiPNPQjxQo5TSvsoA/+nIbfZH582r6HxcKE+mW9CKhVzuN1faSrVgzZIwzCrLxAg== X-Received: by 2002:a05:600c:3ca6:b0:42c:c1f6:6ded with SMTP id 5b1f17b1804b1-42f85af8a7amr53617885e9.29.1728160495192; Sat, 05 Oct 2024 13:34:55 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:54 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 13/15] staging: rtl8723bs: Remove function pointer read_adapter_info Date: Sat, 5 Oct 2024 22:33:56 +0200 Message-ID: <24eec4df528051fee3cf850308e009f114e14288.1727966761.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 read_adapter_info and use ReadAdapterInfo8723BS directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 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 ec95d3ec3170..efc4b44caad3 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -14,8 +14,7 @@ void rtw_hal_chip_configure(struct adapter *padapter) =20 void rtw_hal_read_chip_info(struct adapter *padapter) { - if (padapter->HalFunc.read_adapter_info) - padapter->HalFunc.read_adapter_info(padapter); + ReadAdapterInfo8723BS(padapter); } =20 void rtw_hal_read_chip_version(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 6a56a5db5a5f..a6766a98042c 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1132,7 +1132,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *pad= apter) return _SUCCESS; } =20 -static void ReadAdapterInfo8723BS(struct adapter *padapter) +void ReadAdapterInfo8723BS(struct adapter *padapter) { /* Read EEPROM size before call any EEPROM function */ padapter->EepromAddressSize =3D GetEEPROMSize8723B(padapter); @@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->read_adapter_info =3D &ReadAdapterInfo8723BS; - pHalFunc->enable_interrupt =3D &EnableInterrupt8723BSdio; pHalFunc->disable_interrupt =3D &DisableInterrupt8723BSdio; pHalFunc->check_ips_status =3D &CheckIPSStatus; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 1932f93d89c7..ed303a623e1b 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 (*read_adapter_info)(struct adapter *padapter); - void (*enable_interrupt)(struct adapter *padapter); void (*disable_interrupt)(struct adapter *padapter); u8 (*check_ips_status)(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index dbd051a34d90..783f64de0aec 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -90,5 +90,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, = void *prframe); void rtl8723b_read_chip_version(struct adapter *padapter); void rtl8723bs_init_default_value(struct adapter *padapter); void rtl8723bs_interface_configure(struct adapter *padapter); +void ReadAdapterInfo8723BS(struct adapter *padapter); =20 #endif --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 8BBB417B4FA for ; Sat, 5 Oct 2024 20:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; cv=none; b=sXaR+rHsdx4GFbosOZSGYhtWWQBSGYuihvNxb7OsS7npSBrGsw/VqnzgcnxGdVLTfEoargVQ8j49UOut9M6SRaCKz/HfQmeX5iefBM4JEeKjeLraJq5vnDS7NQsu40H9sROE3lyMV+pD3dmvJhBll+i+EFaEoYKyuj6C7tqIdr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; c=relaxed/simple; bh=EVBlHAuvsFXpnXq2JN7skn/v/lX4N53cicZaL5So/jw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pduGZIe9RLD7l8nBxRw8TrBe9fWUOf9ZREYBTeD3g3qXUNgSLkcSlcOzOnUO+W3Bbf0yQVsnnWLzR1Mb/Dd/wc2frtkVT9fGfrVfwFHWMM1CiGkrb8LMSfEkt+u/5cLegs8AupAEicfnyAH+eBKQXig7DtnKgysUcqSBINURyqg= 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=bYvmig8J; arc=none smtp.client-ip=209.85.128.54 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="bYvmig8J" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42cafda818aso31614935e9.2 for ; Sat, 05 Oct 2024 13:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160496; x=1728765296; 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=DSBQvkenhZ5S0EKj6cByYIpak2n0/Sv0jB8kQTzhNJ0=; b=bYvmig8J7f0vfLTS+46hP6noPed3BJDuk1eTwv752hNPzlOBhySWczSKkSC4wJAYkz r8V68+4eOEdruTaf9B5UgHr2+JkEX5Dr27hFJboLUClvtYgaPT1skyiVatOsNNrvp7Yo jvEganUs/HvmMk1xrZedXC3aguq9dycJ67KP2rL1p1eOYGPLscKI0A4VuQY9a27fW/5w LvkAyaPdAn17Yssx5wMKoW1UR1E7PeK/lj0kcTJ1M41d0y23yM1TXLU+BdTeL8LkWAdi BQJD8EkrrTtI5P9U/ZbCoDuOIPLJQeZlnTPQoqqP/+aJKbm3oCeZRHkYIW3m6rWC4BbI aTCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160496; x=1728765296; 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=DSBQvkenhZ5S0EKj6cByYIpak2n0/Sv0jB8kQTzhNJ0=; b=QdZaC2NchuQ2+1mWjk6Y32W56hlcCUE9JBeba4DNiDc8Oa8zgqL6dcevl7OmhQ0obG 4nlho4hci/gR48zs1On1atUeF5/LtrG/KEaFWGdTCOi2gOUZkgwE5OkhMQ8HnwyKE9pt BWAvm0D0FcxvhBJNa/nAxO7AytyKMu/hxO2QjLVuEEAtUf6wZYrA7HDQSqwb7dRYfNrO gkDIxl2/PpNvCCgq77CIKuqs/3D7/pANDfVyRxNCkO8Avu1ptK/Zs/dsZlM6lYwY32RW Tlwj8AzPwAQLEgqVgdp787pkOUcysqHv3iyg6pEYsAXqPKQcJ5VGk4HNSSUtCnnYvGb5 z3Dw== X-Forwarded-Encrypted: i=1; AJvYcCUdNbho8C4DlIMYii5dPQ6niWnWJ9A9kGpqrD2cmaVaz6jcu4+W/8jjZYP25NR0q0+alC2phdkbHfS8r7o=@vger.kernel.org X-Gm-Message-State: AOJu0YzrmlGCbevyWCmsMTrkpDiUGw/0shHA0XK1FR9C25ttLaH4hbrf JmZtwu6Q/DqBTRD0e+svG/2V8c+ewvuewR6MZxaLnDVGwu8L2hd2 X-Google-Smtp-Source: AGHT+IEPBX3otu02ikRIi1nWMy7nnlbW+ERjlGid6n1rVzN0v3C9gvy4mHIxK8EbqxHKBA98IDhdaw== X-Received: by 2002:a05:600c:3150:b0:42f:75cd:2566 with SMTP id 5b1f17b1804b1-42f85a6d72fmr50211435e9.2.1728160495774; Sat, 05 Oct 2024 13:34:55 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:55 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 14/15] staging: rtl8723bs: Remove function pointer enable_interrupt Date: Sat, 5 Oct 2024 22:33:57 +0200 Message-ID: <728827e155bdcd9951683e485d789d60bc203815.1727966761.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 enable_interrupt and use EnableInterrupt8723BSdio directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.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 efc4b44caad3..716eefdf8ce2 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -146,8 +146,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, enum= hal_odm_variable eVariab =20 void rtw_hal_enable_interrupt(struct adapter *padapter) { - if (padapter->HalFunc.enable_interrupt) - padapter->HalFunc.enable_interrupt(padapter); + EnableInterrupt8723BSdio(padapter); } =20 void rtw_hal_disable_interrupt(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index a6766a98042c..91aac5d1c23e 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->enable_interrupt =3D &EnableInterrupt8723BSdio; pHalFunc->disable_interrupt =3D &DisableInterrupt8723BSdio; pHalFunc->check_ips_status =3D &CheckIPSStatus; pHalFunc->SetHwRegHandler =3D &SetHwReg8723BS; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index ed303a623e1b..3b35bc30ae37 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 (*enable_interrupt)(struct adapter *padapter); void (*disable_interrupt)(struct adapter *padapter); u8 (*check_ips_status)(struct adapter *padapter); void (*set_channel_handler)(struct adapter *padapter, u8 channel); --=20 2.43.0 From nobody Thu Nov 28 01:37:27 2024 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.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 0585E17BB3A for ; Sat, 5 Oct 2024 20:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; cv=none; b=EidPeCc0dx77ntsSUERw+sQWmVBzy6r9D4kRbjFWHHyOBkOaKhKcU6ipxoi7nF7WHTHwNxP0CzEXfxACu7VqBem9TAKLeYCwar3K9Y9agQ8ivtWYNEqTEnnF8sKXDRMRUwBSceOezEsZoyIhU1pTkwoUVdBjgUsyF4ZfTuqIdMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728160499; c=relaxed/simple; bh=1NPyRFoXYsmzQmVr+4N2D8CkoGezEPggmbkJKOyKrvY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HA9JSIcNJuiRKcJG8vtaDw5CX+/AkBZERideo2Qj+9nXjkZNlzY0naRxwXJZ4Po7JLQ1YWLtjBm+P+ALsK9ECihIaxtTxLbp0txmhYQwx9ZTIUh73jWbPu0mo2dwInN2bkx+N5IC80yeOhdeJ9xDfV+HJ/Do6oL9rfweM5KFAps= 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=hChwPrAB; arc=none smtp.client-ip=209.85.221.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="hChwPrAB" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-37ccdc0d7f6so2171412f8f.0 for ; Sat, 05 Oct 2024 13:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728160496; x=1728765296; 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=YAmU5PIwu+h3iMbfgPqTdmPj591zU2oyZRmEuHd0hfo=; b=hChwPrABUlSgQN1bhKyekSwhJHqxNl5gYwKmwpxb3mh1YzhIlVHrH+fVHP0itGoKSK Xa1YZ46rEcVM35gxaB+9NCIaqc9Y5vULgYQY3JG2IgJXHzTjq4XBjiD3rmUNnrmiyHrX F58puFzDI/Mi1PEMmF9MFZWowaOLxQDiZ1RJec48exfQv/eqgLMTD9ODkSOXMMk2uQ6V hyKHMiShYjyBKFLBbQY0b6+M8HM0GdGUyeQoQrOZnZj5jB4eHCrw4sa1HO03PD2aCNtb AQogMD3mhhvpAOdyqVAHN8bC6cLEhoATIY4prh7jL/EahCgZvdN2/WsFZDYLxHtWCAtR nGEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728160496; x=1728765296; 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=YAmU5PIwu+h3iMbfgPqTdmPj591zU2oyZRmEuHd0hfo=; b=jvWJSNON5R13uxh73DyYo+WmCD4OdwXAxU75yvcA4Ja1aG14Sbq3FesgdtP/bb0m+O KpHEys/bZPhim85HFQssSoiBjYcZxRl9mYhh6US18HXJDKKM4yicc9ym/13WQT1tmgX/ SMSX8HBB2gS1CaLQ828OGypGdm64peGtetRsTfoU6pL5XfM7p43cKibzrvVj1vI69YSY IeDQk15snaXiHUpvAfg39ThEmaMCHp2yj2zlZNipfowh75ZkKXs41mnZxhul88U9+Cik wkX4wMktDsRY6oW+74AinO7ntTdAUvbSom2wqYQB1hhHmh7D+RSwSYCOeso04gypZwlF uu0A== X-Forwarded-Encrypted: i=1; AJvYcCXQdtrNoDWsL3E8nfr8Ug0Pm9aOrNff3wXzKNwO0QmGOnP9NXDjNbc/f788Jh94itcAFVNCyp5qGvP7TZ0=@vger.kernel.org X-Gm-Message-State: AOJu0YzPWCmqqXVnhb70ejRDG2g/YmF2/5n4VULWuikYQmmedeALqD9q nxJv+pmGud7od/Gyn26rSE/eJ0XUddWmZ42T1steBCJqKIdGj8Lq X-Google-Smtp-Source: AGHT+IE3u2d/XA/BRxCRMYITyUm7hpGLoxbouAX4SbeqDTeKf+IbH0rR2gGGhqLu/isVMKOYqvE4vQ== X-Received: by 2002:adf:8b16:0:b0:374:c69b:5a16 with SMTP id ffacd0b85a97d-37d0e8de89dmr3949246f8f.50.1728160496269; Sat, 05 Oct 2024 13:34:56 -0700 (PDT) Received: from kernel-710.speedport.ip (p54a0712c.dip0.t-ipconnect.de. [84.160.113.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f85995932sm41824805e9.0.2024.10.05.13.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 13:34:56 -0700 (PDT) From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Philipp Hortmann Subject: [PATCH 15/15] staging: rtl8723bs: Remove function pointer disable_interrupt Date: Sat, 5 Oct 2024 22:33:58 +0200 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 disable_interrupt and use DisableInterrupt8723BSdio directly to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.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 716eefdf8ce2..11d75b1b1ea9 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -151,8 +151,7 @@ void rtw_hal_enable_interrupt(struct adapter *padapter) =20 void rtw_hal_disable_interrupt(struct adapter *padapter) { - if (padapter->HalFunc.disable_interrupt) - padapter->HalFunc.disable_interrupt(padapter); + DisableInterrupt8723BSdio(padapter); } =20 u8 rtw_hal_check_ips_status(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 91aac5d1c23e..a64b28bee019 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) =20 rtl8723b_set_hal_ops(pHalFunc); =20 - pHalFunc->disable_interrupt =3D &DisableInterrupt8723BSdio; pHalFunc->check_ips_status =3D &CheckIPSStatus; pHalFunc->SetHwRegHandler =3D &SetHwReg8723BS; pHalFunc->GetHwRegHandler =3D &GetHwReg8723BS; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 3b35bc30ae37..5b52b0fd95f0 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 (*disable_interrupt)(struct adapter *padapter); u8 (*check_ips_status)(struct adapter *padapter); 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 2.43.0