From nobody Tue Apr 7 18:32:06 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3C162882D6 for ; Wed, 11 Mar 2026 23:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271834; cv=none; b=gLgLTz1sahmsFgNfR0GIaEKpvKsOquq1n2E+coDw4WJbfQJarp//nsEvDvjsff3ANtPx/IoyN6iBgnty5sBfgu4Bu6Jv7i/EhdrehHmoCXVlQ9QBt3s43kev0IZdVxTRxs0tt9nI+RQhREY5uFQA5JnzVhYL7c4W8xt0N8mHJg8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271834; c=relaxed/simple; bh=irHwrCeEmiPZv3niXK2SM8XiM9rOhKpSgwSkx/oRV4A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=H9KUOAU9TYmAzAexCjxgQiPsiLJOnin6fCcsmR91c8V6kwqcStZuqPLFKbr01TtQxy+iDWBMrVXqPGDUoc1xXotniB1cOAEzrEXojIR/EJxGttRCb1Bjqq7eSsrID8SOtAKSmnuZfl4cAl1+v7Tdvhu+38E0RxANdG7h/CczW20= 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=cj8EacCA; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cj8EacCA" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5a159c1e65aso449986e87.0 for ; Wed, 11 Mar 2026 16:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773271830; x=1773876630; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jtehQqOf1CJyx8VcBbnhCzs7iunB/Cngeno09dH8alQ=; b=cj8EacCA5y2KpuK5uqzkdvBg6EDzaAp1w4iUxaBpUEOd7GdRvP2bPnEUiv+9ReY/hZ 2o2ZF8uPMHr6MCYxb+b6AxrL00I6tmUI5lE+4QZaZDjc/sn++HWzcey9qAqbbWyIZieQ Yg88XQYRPEfU8+cLRPFgbJsiuMCvDTB/GyRiL66IgPPiwVeFrPLKtfyV6f0All6N68AI w2c3phpvJ7IAYRBqaHI+ArSUadNMIcl6Q8MzoTOAbb79UwN8MPRjirInKuZEEQTvdOzu MALVCn1kc9SEqJq6ja0I1M57Lo9/81Q4VDDKZDuHD/qvVizk/mSZmCJNfutDk3m41N8i 0hwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773271830; x=1773876630; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jtehQqOf1CJyx8VcBbnhCzs7iunB/Cngeno09dH8alQ=; b=Ydj+BRhelchPpwsr8KuxjpGSltQxxUedP0B9oN99f7JE2CsycHyzvehkriA9EZEvLW WTCtMNv+pEXVvFIUXa927AWDbGdRK+44l2FAsK6AsWIV0oaNbU7aikxVJLzSQzcf9Rp7 xK0H/uqvHlM0T+vUs2oilwEXf6nfOSPMx7iL08JlJTNigdcswTiZH/QriDK8W6RtBJtz G9pvYSOVnFAB5n6ByPxq9WYg1sXu/i2uqSF9k0kyzmIzQPSK4gRqpS6ZG874BbPtZCqo ar5VPoB++yPb3qzbMXPmVJTArVtUTyczSmPG5N5qy50Kn9ZKB275YUPwdBOmwZDJ38ll CV5w== X-Forwarded-Encrypted: i=1; AJvYcCWV2MghsMe/DqPg+u991Rs7jSlhQbQ2uRUjOOy4H3OgobG+aqsGi/RGb4XcaI0uK7shf2fy3rSho2tKQCk=@vger.kernel.org X-Gm-Message-State: AOJu0YxaQqeju9mAecHyv82FSbbTM6CAxjfDJGKiW2znkBp6eQo0AS2C d6mJCNWgOh6ZpENayiF+0xZrrpoilsTUYZXVJXaNxDGbJWOr2TGy8pTb X-Gm-Gg: ATEYQzyWwPVkUhw5xRM17a/cy/3LZqZOdgNNN/o/EEli7VI7/7GXuBKQCacPpdwPVuz YnQufDMH5uBNE3COU0PqOy9WazInWcaTlSIcBC1CmDveWWEjifO48VFqs265oJEgA/q4EooX+jK ZbJCXqW2GwmyvDlzd+80A9qWumZ1TechU+Gg87rVLLoAtS9OPTv+amSKu6zMUlVGKKzfKZyyJzc NmkAIAI2yQYOAuqPK3ReYY0rCGdyoKA0I6twIkY0f76p16kzThEZXfpnbImwEKZcpxD/VRsU8WZ KJLebTQghpJ48O5z0kb8kmedgdtYaaLrVaBaS23R2iuwpacak8mw+G9qO26rwlz3kfneXomBhzR Fli2566ShXJimcKzzZW2hlCNipOVIMkT0zBgLy89E73FbS+hogdWOLf/CZgyDJMAVEaTPlHUyt1 CamqJfY/Y5COANM36F/ZOUVD0fY2B5zPOu6wSBse2X4JA66r1mGRIJcKB/Scixa1FFFZs7UQbYj A== X-Received: by 2002:a05:6512:3f05:b0:5a1:1daf:f7b2 with SMTP id 2adb3069b0e04-5a156b5e4c5mr1633052e87.0.1773271829469; Wed, 11 Mar 2026 16:30:29 -0700 (PDT) Received: from T6NXCV08J99224A.lan (81-237-238-191-no600.tbcn.telia.com. [81.237.238.191]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a155f3483asm627688e87.2.2026.03.11.16.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 16:30:28 -0700 (PDT) From: Oskar Ray-Frayssinet To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Oskar Ray-Frayssinet Subject: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks Date: Thu, 12 Mar 2026 00:30:09 +0100 Message-ID: <20260311233009.16236-1-rayfraytech@gmail.com> X-Mailer: git-send-email 2.43.0 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 unnecessary braces around single statement blocks throughout the rtl8723bs driver to comply with kernel coding style. Signed-off-by: Oskar Ray-Frayssinet --- drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 108 +++++++----------- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 ++-- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 6 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +- drivers/staging/rtl8723bs/hal/odm.c | 3 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 28 ++--- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +- .../rtl8723bs/hal/odm_RegConfig8723B.c | 6 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 42 +++---- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +- 15 files changed, 96 insertions(+), 162 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 337671b1211f..10eee7bcfe12 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct a= dapter *adapter, union recv_f =20 } =20 - if (ret =3D=3D _FAIL) { + if (ret =3D=3D _FAIL) goto exit; - } else if (ret =3D=3D RTW_RX_HANDLED) { + else if (ret =3D=3D RTW_RX_HANDLED) goto exit; - } =20 =20 if (!psta) { diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.c index d32dbf94858f..0baa515a7067 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -35,49 +35,43 @@ static u8 halbtc8723b2ant_BtRssiState( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_HIGH; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else { - if (btRssi < rssiThresh) { + if (btRssi < rssiThresh) btRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } else if (levelNum =3D=3D 3) { - if (rssiThresh > rssiThresh1) { + if (rssiThresh > rssiThresh1) return pCoexSta->preBtRssiState; - } =20 if ( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else if ( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_MEDIUM) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_MEDIUM) ) { - if (btRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_HIGH; - } else if (btRssi < rssiThresh) { + else if (btRssi < rssiThresh) btRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_MEDIUM; - } } else { - if (btRssi < rssiThresh1) { + if (btRssi < rssiThresh1) btRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } =20 @@ -104,49 +98,43 @@ static u8 halbtc8723b2ant_WifiRssiState( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_HIGH; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else { - if (wifiRssi < rssiThresh) { + if (wifiRssi < rssiThresh) wifiRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } else if (levelNum =3D=3D 3) { - if (rssiThresh > rssiThresh1) { + if (rssiThresh > rssiThresh1) return pCoexSta->preWifiRssiState[index]; - } =20 if ( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else if ( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_MEDIUM) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_MEDIUM) ) { - if (wifiRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_HIGH; - } else if (wifiRssi < rssiThresh) { + else if (wifiRssi < rssiThresh) wifiRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_MEDIUM; - } } else { - if (wifiRssi < rssiThresh1) { + if (wifiRssi < rssiThresh1) wifiRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } =20 @@ -294,9 +282,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_co= exist *pBtCoexist) =20 pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_HS_OPERATION, &bBtHsOn); =20 - if (!pBtLinkInfo->bBtLinkExist) { + if (!pBtLinkInfo->bBtLinkExist) return algorithm; - } =20 if (pBtLinkInfo->bScoExist) numOfDiffProfile++; @@ -319,11 +306,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) } else if (pBtLinkInfo->bA2dpExist) { algorithm =3D BT_8723B_2ANT_COEX_ALGO_A2DP; } else if (pBtLinkInfo->bPanExist) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANHS; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR; - } } } } else if (numOfDiffProfile =3D=3D 2) { @@ -333,11 +319,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) } else if (pBtLinkInfo->bA2dpExist) { algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; } else if (pBtLinkInfo->bPanExist) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_SCO; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; - } } } else { if ( @@ -349,20 +334,18 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; - } } else if ( pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_A2DP_PANHS; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_A2DP; - } } } } else if (numOfDiffProfile =3D=3D 3) { @@ -389,11 +372,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID_A2DP; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID_A2DP_PANEDR; - } } } } else if (numOfDiffProfile >=3D 3) { @@ -480,9 +462,8 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner( } else { /* Resume RF Rx LPF corner */ /* After initialized, we can use pCoexDm->btRf0x1eBackup */ - if (pBtCoexist->bInitilized) { + if (pBtCoexist->bInitilized) pBtCoexist->fBtcSetRfReg(pBtCoexist, BTC_RF_A, 0x1e, 0xfffff, pCoexDm->= btRf0x1eBackup); - } } } =20 @@ -2202,13 +2183,11 @@ static void halbtc8723b2ant_RunCoexistMechanism(str= uct btc_coexist *pBtCoexist) { u8 algorithm =3D 0; =20 - if (pBtCoexist->bManualControl) { + if (pBtCoexist->bManualControl) return; - } =20 - if (pCoexSta->bUnderIps) { + if (pCoexSta->bUnderIps) return; - } =20 algorithm =3D halbtc8723b2ant_ActionAlgorithm(pBtCoexist); if (pCoexSta->bC2hBtInquiryPage && (BT_8723B_2ANT_COEX_ALGO_PANHS !=3D al= gorithm)) { @@ -2226,9 +2205,8 @@ static void halbtc8723b2ant_RunCoexistMechanism(struc= t btc_coexist *pBtCoexist) if (halbtc8723b2ant_IsCommonAction(pBtCoexist)) { pCoexDm->bAutoTdmaAdjust =3D false; } else { - if (pCoexDm->curAlgorithm !=3D pCoexDm->preAlgorithm) { + if (pCoexDm->curAlgorithm !=3D pCoexDm->preAlgorithm) pCoexDm->bAutoTdmaAdjust =3D false; - } =20 =20 switch (pCoexDm->curAlgorithm) { @@ -2406,11 +2384,10 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist= *pBtCoexist, u8 type) =20 void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type) { - if (type =3D=3D BTC_LPS_ENABLE) { + if (type =3D=3D BTC_LPS_ENABLE) pCoexSta->bUnderLps =3D true; - } else if (type =3D=3D BTC_LPS_DISABLE) { + else if (type =3D=3D BTC_LPS_DISABLE) pCoexSta->bUnderLps =3D false; - } } =20 void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type) @@ -2486,9 +2463,8 @@ void EXhalbtc8723b2ant_BtInfoNotify( =20 } =20 - if (pBtCoexist->bManualControl) { + if (pBtCoexist->bManualControl) return; - } =20 if (BT_INFO_SRC_8723B_2ANT_WIFI_FW !=3D rspSource) { pCoexSta->btRetryCnt =3D pCoexSta->btInfoC2h[rspSource][2] & 0xf; /* [3:= 0] */ diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl= 8723bs/hal/HalPhyRf.c index 7bef05a9a063..5d2562dae16a 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c @@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct ad= apter *Adapter) } =20 /* Calculate Average ThermalValue after average enough times */ - if (ThermalValue_AVG_count) { + if (ThermalValue_AVG_count) ThermalValue =3D (u8)(ThermalValue_AVG / ThermalValue_AVG_count); - } =20 /* 4 5. Calculate delta, delta_LCK */ /* delta" here is used to determine whether thermal value changes or not.= */ diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/stagi= ng/rtl8723bs/hal/HalPhyRf_8723B.c index 9df3274c1048..b96761321d0f 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c @@ -1120,9 +1120,8 @@ static void _PHY_SaveADDARegisters8723B( if (!ODM_CheckPowerStatus(padapter)) return; =20 - for (i =3D 0 ; i < RegisterNum ; i++) { + for (i =3D 0 ; i < RegisterNum ; i++) ADDABackup[i] =3D PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWor= d); - } } =20 =20 @@ -1134,9 +1133,8 @@ static void _PHY_SaveMACRegisters8723B( struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dm_odm_t *pDM_Odm =3D &pHalData->odmpriv; =20 - for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) MACBackup[i] =3D rtw_read8(pDM_Odm->Adapter, MACReg[i]); - } MACBackup[i] =3D rtw_read32(pDM_Odm->Adapter, MACReg[i]); =20 } @@ -1153,9 +1151,8 @@ static void _PHY_ReloadADDARegisters8723B( struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dm_odm_t *pDM_Odm =3D &pHalData->odmpriv; =20 - for (i =3D 0 ; i < RegiesterNum; i++) { + for (i =3D 0 ; i < RegiesterNum; i++) PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]); - } } =20 static void _PHY_ReloadMACRegisters8723B( @@ -1164,9 +1161,8 @@ static void _PHY_ReloadMACRegisters8723B( { u32 i; =20 - for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]); - } rtw_write32(padapter, MACReg[i], MACBackup[i]); } =20 @@ -1190,9 +1186,8 @@ static void _PHY_PathADDAOn8723B( PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn); } =20 - for (i =3D 1 ; i < IQK_ADDA_REG_NUM ; i++) { + for (i =3D 1 ; i < IQK_ADDA_REG_NUM ; i++) PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn); - } =20 } =20 @@ -1206,9 +1201,8 @@ static void _PHY_MACSettingCalibration8723B( =20 rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F); =20 - for (i =3D 1 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 1 ; i < (IQK_MAC_REG_NUM - 1); i++) rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3))); - } rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5))); =20 } @@ -1538,9 +1532,8 @@ static void phy_LCCalibrate_8723B(struct dm_odm_t *pD= M_Odm, bool is2T) PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0= ); /* LDO OFF */ =20 /* Channel 10 LC calibration issue for 8723bs with 26M xtal */ - if (pDM_Odm->SupportInterface =3D=3D ODM_ITRF_SDIO && pDM_Odm->PackageTyp= e >=3D 0x2) { + if (pDM_Odm->SupportInterface =3D=3D ODM_ITRF_SDIO && pDM_Odm->PackageTyp= e >=3D 0x2) PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal= ); - } =20 /* Restore original situation */ if ((tmpReg&0x70) !=3D 0) { /* Deal with contisuous TX case */ diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index 9105594d2dde..77f02c160cb5 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_= coexist *pBtCoexist, u8 pktTy if (pBtCoexist->bManualControl) return; =20 - if (pktType =3D=3D PACKET_DHCP) { + if (pktType =3D=3D PACKET_DHCP) packetType =3D BTC_PACKET_DHCP; - } else if (pktType =3D=3D PACKET_EAPOL) { + else if (pktType =3D=3D PACKET_EAPOL) packetType =3D BTC_PACKET_EAPOL; - } else if (pktType =3D=3D PACKET_ARP) { + else if (pktType =3D=3D PACKET_ARP) packetType =3D BTC_PACKET_ARP; - } else { + else return; - } =20 /* All notify is called in cmd thread, don't need to leave low power aga= in */ /* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index dc2da49e6738..736d99d6cd4b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -323,9 +323,8 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *p= adapter, u32 RfPath, if (RfPath >=3D RF_PATH_MAX) return; =20 - for (i =3D 0; i < rateNum; ++i) { + for (i =3D 0; i < rateNum; ++i) pHalData->TxPwrByRateOffset[RfPath][rateIndex[i]] =3D PwrByRateVal[i]; - } } =20 static void PHY_StoreTxPowerByRateOld( @@ -361,9 +360,8 @@ void PHY_StoreTxPowerByRate( =20 if (pDM_Odm->PhyRegPgVersion > 0) PHY_StoreTxPowerByRateNew(padapter, RfPath, RegAddr, BitMask, Data); - else if (pDM_Odm->PhyRegPgVersion =3D=3D 0) { + else if (pDM_Odm->PhyRegPgVersion =3D=3D 0) PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data); - } } =20 static void diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 27c0c0198714..45634b5e5082 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -208,9 +208,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 r= ssi_level) =20 if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) add_ratid(padapter, psta, rssi_level); - else { + else UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level); - } } =20 void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 = rssi_level) @@ -254,9 +253,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter) =20 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter) { - if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) { + if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in i= nterrupt context */ - } } =20 void beacon_timing_control(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723b= s/hal/odm.c index 639b6da2302b..2838381bff0e 100644 --- a/drivers/staging/rtl8723bs/hal/odm.c +++ b/drivers/staging/rtl8723bs/hal/odm.c @@ -270,9 +270,8 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm= _t *pDM_Odm) if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id =3D=3D= 1) */ continue; =20 - if (true =3D=3D ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedS= moothedPWDB, false, &pstat->rssi_level)) { + if (true =3D=3D ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedS= moothedPWDB, false, &pstat->rssi_level)) rtw_hal_update_ra_mask(pstat, pstat->rssi_level); - } =20 } } diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8= 723bs/hal/odm_DIG.c index f10427abd849..33661182d85a 100644 --- a/drivers/staging/rtl8723bs/hal/odm_DIG.c +++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c @@ -220,9 +220,8 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI) s8 Diff, IGI_target; bool EDCCA_State =3D false; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)) { + if (!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)) return; - } =20 if (*pDM_Odm->pBandWidth =3D=3D ODM_BW20M) /* CHANNEL_WIDTH_20 */ IGI_target =3D pDM_Odm->IGI_Base; @@ -286,16 +285,14 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI) struct dm_odm_t *pDM_Odm =3D (struct dm_odm_t *)pDM_VOID; struct dig_t *pDM_DigTable =3D &pDM_Odm->DM_DigTable; =20 - if (pDM_DigTable->bStopDIG) { + if (pDM_DigTable->bStopDIG) return; - } =20 if (pDM_DigTable->CurIGValue !=3D CurrentIGI) { /* 1 Check initial gain by upper bound */ if (!pDM_DigTable->bPSDInProgress) { - if (CurrentIGI > pDM_DigTable->rx_gain_range_max) { + if (CurrentIGI > pDM_DigTable->rx_gain_range_max) CurrentIGI =3D pDM_DigTable->rx_gain_range_max; - } =20 } =20 @@ -314,24 +311,20 @@ bool odm_DigAbort(void *pDM_VOID) struct dm_odm_t *pDM_Odm =3D (struct dm_odm_t *)pDM_VOID; =20 /* SupportAbility */ - if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) { + if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) return true; - } =20 /* SupportAbility */ - if (!(pDM_Odm->SupportAbility & ODM_BB_DIG)) { + if (!(pDM_Odm->SupportAbility & ODM_BB_DIG)) return true; - } =20 /* ScanInProcess */ - if (*(pDM_Odm->pbScanInProcess)) { + if (*(pDM_Odm->pbScanInProcess)) return true; - } =20 /* add by Neil Chen to avoid PSD is processing */ - if (pDM_Odm->bDMInitialGainEnable =3D=3D false) { + if (pDM_Odm->bDMInitialGainEnable =3D=3D false) return true; - } =20 return false; } @@ -413,9 +406,9 @@ void odm_DIG(void *pDM_VOID) if (pDM_Odm->bLinked && bPerformance) { /* 2 Modify DIG upper bound */ /* 4 Modify DIG upper bound for 92E, 8723A\B, 8821 & 8812 BT */ - if (pDM_Odm->bBtLimitedDig =3D=3D 1) { + if (pDM_Odm->bBtLimitedDig =3D=3D 1) offset =3D 10; - } else + else offset =3D 15; =20 if ((pDM_Odm->RSSI_Min + offset) > dm_dig_max) @@ -475,9 +468,8 @@ void odm_DIG(void *pDM_VOID) } =20 /* 2 Abnormal lower bound case */ - if (pDM_DigTable->rx_gain_range_min > pDM_DigTable->rx_gain_range_max) { + if (pDM_DigTable->rx_gain_range_min > pDM_DigTable->rx_gain_range_max) pDM_DigTable->rx_gain_range_min =3D pDM_DigTable->rx_gain_range_max; - } =20 =20 /* 1 False alarm threshold decision */ diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging= /rtl8723bs/hal/odm_HWConfig.c index 994b8c578e7a..1e67e27994c7 100644 --- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c @@ -240,9 +240,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *= dm_odm, if (is_cck_rate) { phy_info->signal_strength =3D (u8)(odm_signal_scale_mapping(dm_odm, pwdb= _all)); } else { - if (rf_rx_num !=3D 0) { + if (rf_rx_num !=3D 0) phy_info->signal_strength =3D (u8)(odm_signal_scale_mapping(dm_odm, tot= al_rssi /=3D rf_rx_num)); - } } } =20 diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c b/drivers/s= taging/rtl8723bs/hal/odm_RegConfig8723B.c index 1df42069bd5c..b0ca46aec1a5 100644 --- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c @@ -125,9 +125,8 @@ void odm_ConfigBB_PHY_REG_PG_8723B( { if (Addr =3D=3D 0xfe || Addr =3D=3D 0xffe) msleep(50); - else { + else PHY_StoreTxPowerByRate(pDM_Odm->Adapter, RfPath, Addr, Bitmask, Data); - } } =20 void odm_ConfigBB_PHY_8723B( @@ -149,9 +148,8 @@ void odm_ConfigBB_PHY_8723B( udelay(5); else if (Addr =3D=3D 0xf9) udelay(1); - else { + else PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); - } =20 /* Add 1us delay between BB/RF register setting. */ udelay(1); diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging= /rtl8723bs/hal/rtl8723b_cmd.c index af6cdda8238d..a44f5bd58306 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c @@ -25,9 +25,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, = u8 msgbox_num) =20 do { valid =3D rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num); - if (0 =3D=3D valid) { + if (0 =3D=3D valid) read_down =3D true; - } } while ((!read_down) && (retry_cnts--)); =20 return read_down; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 8d259820f103..cfada1c375c9 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -197,9 +197,8 @@ static s32 polling_fwdl_chksum( yield(); } while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt); =20 - if (!(value32 & FWDL_ChkSum_rpt)) { + if (!(value32 & FWDL_ChkSum_rpt)) goto exit; - } =20 if (g_fwdl_chksum_fail) { g_fwdl_chksum_fail--; @@ -238,9 +237,8 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min= _cnt, u32 timeout_ms) yield(); } while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt); =20 - if (!(value32 & WINTINI_RDY)) { + if (!(value32 & WINTINI_RDY)) goto exit; - } =20 if (g_fwdl_wintint_rdy_fail) { g_fwdl_wintint_rdy_fail--; @@ -1048,9 +1046,8 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) rate_bitmap =3D hal_btcoex_GetRaMask(padapter); mask &=3D ~rate_bitmap; =20 - if (pHalData->fw_ractrl) { + if (pHalData->fw_ractrl) rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mo= de, short_gi_rate, mask); - } =20 /* set correct initial date rate for each mac_id */ pdmpriv->INIDATA_RATE[mac_id] =3D psta->init_rate; @@ -1203,9 +1200,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u= 8 *hwinfo) =20 /* Check 0x8129 again for making sure autoload status!! */ EEPROMId =3D le16_to_cpu(*((__le16 *)hwinfo)); - if (EEPROMId !=3D RTL_EEPROM_ID) { + if (EEPROMId !=3D RTL_EEPROM_ID) pEEPROM->bautoload_fail_flag =3D true; - } else + else pEEPROM->bautoload_fail_flag =3D false; } =20 @@ -1590,13 +1587,12 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct = pkt_attrib *pattrib) if (pattrib->bwmode =3D=3D CHANNEL_WIDTH_40) { SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; } else if (pattrib->bwmode =3D=3D CHANNEL_WIDTH_20) { - if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_UPPER) { + if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_UPPER) SCSettingOfDesc =3D HT_DATA_SC_20_UPPER_OF_40MHZ; - } else if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_LOWE= R) { + else if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_LOWER) SCSettingOfDesc =3D HT_DATA_SC_20_LOWER_OF_40MHZ; - } else { + else SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; - } } } else { SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; @@ -1621,9 +1617,8 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc= *ptxdesc) /* Thomas, Lucas@SD4, 20130515 */ count =3D 16; =20 - for (index =3D 0; index < count; index++) { + for (index =3D 0; index < count; index++) checksum |=3D le16_to_cpu(*(__le16 *)(usPtr + index)); - } =20 ptxdesc->txdw7 |=3D cpu_to_le32(checksum & 0x0000ffff); } @@ -1796,11 +1791,10 @@ static void rtl8723b_fill_default_txdesc( ptxdesc->mbssid =3D pattrib->mbssid & 0xF; =20 ptxdesc->rty_lmt_en =3D 1; /* retry limit enable */ - if (pattrib->retry_ctrl) { + if (pattrib->retry_ctrl) ptxdesc->data_rt_lmt =3D 6; - } else { + else ptxdesc->data_rt_lmt =3D 12; - } =20 ptxdesc->datarate =3D MRateToHwRate(pmlmeext->tx_rate); =20 @@ -1891,9 +1885,8 @@ void rtl8723b_fill_fake_txdesc( SET_TX_DESC_HWSEQ_SEL_8723B(pDesc, 0); } =20 - if (IsBTQosNull) { + if (IsBTQosNull) SET_TX_DESC_BT_INT_8723B(pDesc, 1); - } =20 SET_TX_DESC_USE_RATE_8723B(pDesc, 1); /* use data rate which is set by S= w */ SET_TX_DESC_OWN_8723B((u8 *)pDesc, 1); @@ -2209,9 +2202,8 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u= 8 *pdata, u8 len) #define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(_Header) LE_BITS_TO_1BYTE((_He= ader + 0), 6, 1) #define GET_8723B_C2H_TX_RPT_RETRY_OVER(_Header) LE_BITS_TO_1BYTE((_Header= + 0), 7, 1) =20 - if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TI= ME_OVER(pdata)) { + if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TI= ME_OVER(pdata)) rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); - } /* else if (seq_no !=3D padapter->xmitpriv.seq_no) { rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); @@ -2578,9 +2570,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) =20 /* Forece leave RF low power mode for 1T1R to prevent conficting setti= ng in Fw power */ /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yscha= ng. */ - if (psmode !=3D PS_MODE_ACTIVE) { + if (psmode !=3D PS_MODE_ACTIVE) ODM_RF_Saving(&pHalData->odmpriv, true); - } =20 /* if (psmode !=3D PS_MODE_ACTIVE) { */ /* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */ @@ -2894,11 +2885,10 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum= hal_def_variable variable, v break; =20 case HAL_DEF_TX_PAGE_BOUNDARY: - if (!padapter->registrypriv.wifi_spec) { + if (!padapter->registrypriv.wifi_spec) *(u8 *)pval =3D TX_PAGE_BOUNDARY_8723B; - } else { + else *(u8 *)pval =3D WMM_NORMAL_TX_PAGE_BOUNDARY_8723B; - } break; =20 case HAL_DEF_MACID_SLEEP: diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index a1f2cbf2cf55..e4ab0502458f 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -140,9 +140,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) return _SUCCESS; =20 ret =3D rtw_register_tx_alive(padapter); - if (ret !=3D _SUCCESS) { + if (ret !=3D _SUCCESS) return _SUCCESS; - } =20 do { queue_empty =3D rtl8723_dequeue_writeport(padapter); @@ -373,9 +372,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padap= ter) spin_lock_bh(&pxmitpriv->lock); ret =3D rtw_txframes_pending(padapter); spin_unlock_bh(&pxmitpriv->lock); - if (ret =3D=3D 0) { + if (ret =3D=3D 0) return _SUCCESS; - } =20 /* dequeue frame and write to hardware */ =20 @@ -393,9 +391,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padap= ter) spin_lock_bh(&pxmitpriv->lock); ret =3D rtw_txframes_pending(padapter); spin_unlock_bh(&pxmitpriv->lock); - if (ret =3D=3D 1) { + if (ret =3D=3D 1) goto next; - } =20 return _SUCCESS; } @@ -410,9 +407,8 @@ int rtl8723bs_xmit_thread(void *context) =20 do { ret =3D rtl8723bs_xmit_handler(padapter); - if (signal_pending(current)) { + if (signal_pending(current)) flush_signals(current); - } } while (_SUCCESS =3D=3D ret); =20 complete(&pxmitpriv->SdioXmitTerminate); diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index d664e254912c..a86252ccac76 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -146,9 +146,8 @@ static void sdio_deinit(struct dvobj_priv *dvobj) sdio_claim_host(func); sdio_disable_func(func); =20 - if (dvobj->irq_alloc) { + if (dvobj->irq_alloc) sdio_release_irq(func); - } =20 sdio_release_host(func); } --=20 2.43.0