From: Marc Finkelbaum <regpacy@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michael Straube <straube.linux@gmail.com>,
Dan Carpenter <dan.carpenter@linaro.org>,
Ethan Tidmore <ethantidmore06@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Marc Finkelbaum <regpacy@gmail.com>
Subject: [PATCH 9/9] staging: rtl8723bs: wrap long lines and fix argument alignment
Date: Tue, 14 Apr 2026 12:58:33 +0300 [thread overview]
Message-ID: <20260414095833.76480-10-regpacy@gmail.com> (raw)
In-Reply-To: <20260414095833.76480-1-regpacy@gmail.com>
Break lines that exceed 80 columns and align continuation arguments to
the opening parenthesis. Affected sites: scnprintf calls in
dump_chip_info, hw_chnlPlan assignment, Queue2Pipe[7] assignments in
the pipe-mapping functions, rtw_hal_set_hwreg in hal_init_macaddr,
c2h_evt payload read loop, rtw_write16/rtw_write8 in SetHwReg and
rtw_hal_check_rxfifo_full, rtw_get_stainfo and the UndecoratedSmoothedPWDB
assignment in GetHalDefVar, ODM_CmnInfoPtrArrayHook calls in SetHalODMVar,
and rtw_hal_read_rfreg/PHY_SetRFReg in rtw_bb_rf_gain_offset.
No functional change.
Signed-off-by: Marc Finkelbaum <regpacy@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_com.c | 71 +++++++++++++++++--------
1 file changed, 48 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 2688355f9265..0e3b5831d974 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -35,8 +35,10 @@ void dump_chip_info(struct hal_version ChipVersion)
char buf[128];
size_t cnt = 0;
- cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "Chip Version Info: CHIP_8723B_%s_",
- IS_NORMAL_CHIP(ChipVersion) ? "Normal_Chip" : "Test_Chip");
+ cnt += scnprintf(buf + cnt, sizeof(buf) - cnt,
+ "Chip Version Info: CHIP_8723B_%s_",
+ IS_NORMAL_CHIP(ChipVersion) ? "Normal_Chip" :
+ "Test_Chip");
if (IS_CHIP_VENDOR_TSMC(ChipVersion))
cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "TSMC_");
@@ -63,11 +65,12 @@ void dump_chip_info(struct hal_version ChipVersion)
cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "K_CUT_");
else
cnt += scnprintf(buf + cnt, sizeof(buf) - cnt,
- "UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion);
+ "UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion);
cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T1R_");
- cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "RomVer(%d)\n", ChipVersion.ROMVer);
+ cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "RomVer(%d)\n",
+ ChipVersion.ROMVer);
}
#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80
@@ -107,7 +110,8 @@ u8 hal_com_config_channel_plan(struct adapter *padapter, u8 hw_channel_plan,
if (!AutoLoadFail) {
u8 hw_chnlPlan;
- hw_chnlPlan = hw_channel_plan & (~EEPROM_CHANNEL_PLAN_BY_HW_MASK);
+ hw_chnlPlan = hw_channel_plan &
+ (~EEPROM_CHANNEL_PLAN_BY_HW_MASK);
if (rtw_is_channel_plan_valid(hw_chnlPlan)) {
if (hw_channel_plan & EEPROM_CHANNEL_PLAN_BY_HW_MASK)
pHalData->bDisableSWChannelPlan = true;
@@ -364,9 +368,11 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0]; /* BCN */
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0]; /* MGT */
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[0]; /* HIGH */
- pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0]; /* TXCMD */
+ pdvobjpriv->Queue2Pipe[7] =
+ pdvobjpriv->RtOutPipe[0]; /* TXCMD */
} else { /* typical setting */
+
/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */
/* 1, 1, 0, 0, 0, 0, 0, 0, 0 }; */
/* 0:ep_0 num, 1:ep_1 num */
@@ -379,8 +385,8 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0]; /* BCN */
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0]; /* MGT */
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[0]; /* HIGH */
- pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0]; /* TXCMD */
-
+ pdvobjpriv->Queue2Pipe[7] =
+ pdvobjpriv->RtOutPipe[0]; /* TXCMD */
}
}
@@ -401,9 +407,11 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0]; /* BCN */
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0]; /* MGT */
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[0]; /* HIGH */
- pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0]; /* TXCMD */
+ pdvobjpriv->Queue2Pipe[7] =
+ pdvobjpriv->RtOutPipe[0]; /* TXCMD */
} else { /* typical setting */
+
/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */
/* 2, 2, 1, 0, 0, 0, 0, 0, 0 }; */
/* 0:H, 1:N, 2:L */
@@ -416,7 +424,8 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0]; /* BCN */
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0]; /* MGT */
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[0]; /* HIGH */
- pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0]; /* TXCMD */
+ pdvobjpriv->Queue2Pipe[7] =
+ pdvobjpriv->RtOutPipe[0]; /* TXCMD */
}
}
@@ -449,7 +458,8 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 NumOutPipe)
void hal_init_macaddr(struct adapter *adapter)
{
- rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr);
+ rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR,
+ adapter->eeprompriv.mac_addr);
}
void rtw_init_hal_com_default_value(struct adapter *Adapter)
@@ -502,7 +512,8 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
/* Read the content */
for (i = 0; i < c2h_evt->plen; i++)
- c2h_evt->payload[i] = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL + 2 + i);
+ c2h_evt->payload[i] =
+ rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL + 2 + i);
ret = _SUCCESS;
@@ -565,7 +576,9 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)
u16 reg_scr;
reg_scr = rtw_read16(adapter, REG_SECCFG);
- rtw_write16(adapter, REG_SECCFG, reg_scr | SCR_CHK_KEYID | SCR_RxDecEnable | SCR_TxEncEnable);
+ rtw_write16(adapter, REG_SECCFG,
+ reg_scr | SCR_CHK_KEYID | SCR_RxDecEnable |
+ SCR_TxEncEnable);
} break;
case HW_VAR_SEC_DK_CFG: {
struct security_priv *sec = &adapter->securitypriv;
@@ -576,7 +589,8 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)
if (sec->dot11AuthAlgrthm != dot11AuthAlgrthm_8021X)
reg_scr |= (SCR_RxUseDK | SCR_TxUseDK);
} else { /* Disable default key related setting */
- reg_scr &= ~(SCR_RXBCUSEDK | SCR_TXBCUSEDK | SCR_RxUseDK | SCR_TxUseDK);
+ reg_scr &= ~(SCR_RXBCUSEDK | SCR_TXBCUSEDK |
+ SCR_RxUseDK | SCR_TxUseDK);
}
rtw_write8(adapter, REG_SECCFG, reg_scr);
@@ -657,9 +671,11 @@ u8 GetHalDefVar(struct adapter *adapter, enum hal_def_variable variable,
pmlmepriv = &adapter->mlmepriv;
pstapriv = &adapter->stapriv;
- psta = rtw_get_stainfo(pstapriv, pmlmepriv->cur_network.network.mac_address);
+ psta = rtw_get_stainfo(pstapriv,
+ pmlmepriv->cur_network.network.mac_address);
if (psta)
- *((int *)value) = psta->rssi_stat.UndecoratedSmoothedPWDB;
+ *((int *)value) =
+ psta->rssi_stat.UndecoratedSmoothedPWDB;
} break;
case HAL_DEF_DBG_DM_FUNC:
*((u32 *)value) = hal_data->odmpriv.SupportAbility;
@@ -701,10 +717,14 @@ void SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable,
struct sta_info *psta = pValue1;
if (bSet) {
- ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, psta);
+ ODM_CmnInfoPtrArrayHook(podmpriv,
+ ODM_CMNINFO_STA_STATUS,
+ psta->mac_id, psta);
} else {
/* spin_lock_bh(&pHalData->odm_stainfo_lock); */
- ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, NULL);
+ ODM_CmnInfoPtrArrayHook(podmpriv,
+ ODM_CMNINFO_STA_STATUS,
+ psta->mac_id, NULL);
/* spin_unlock_bh(&pHalData->odm_stainfo_lock); */
}
@@ -754,7 +774,8 @@ bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt)
void rtw_hal_check_rxfifo_full(struct adapter *adapter)
{
/* switch counter to RX fifo */
- rtw_write8(adapter, REG_RXERR_RPT + 3, rtw_read8(adapter, REG_RXERR_RPT + 3) | 0xf0);
+ rtw_write8(adapter, REG_RXERR_RPT + 3,
+ rtw_read8(adapter, REG_RXERR_RPT + 3) | 0xf0);
}
static u32 Array_kfreemap[] = {
@@ -782,19 +803,23 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)
if (value & BIT4) {
if (padapter->eeprompriv.EEPROMRFGainVal != 0xff) {
- rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f, 0xffffffff);
+ rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f,
+ 0xffffffff);
for (i = 0; i < ARRAY_SIZE(Array_kfreemap); i += 2) {
v1 = Array[i];
v2 = Array[i + 1];
- if (v1 == padapter->eeprompriv.EEPROMRFGainVal) {
+ if (v1 ==
+ padapter->eeprompriv.EEPROMRFGainVal) {
target = v2;
break;
}
}
- PHY_SetRFReg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, BIT18 | BIT17 | BIT16 | BIT15, target);
+ PHY_SetRFReg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET,
+ BIT18 | BIT17 | BIT16 | BIT15, target);
- rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f, 0xffffffff);
+ rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f,
+ 0xffffffff);
}
}
}
--
2.53.0
next prev parent reply other threads:[~2026-04-14 9:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-14 9:58 [PATCH 0/9] staging: rtl8723bs: coding style cleanup in hal_com.c Marc Finkelbaum
2026-04-14 9:58 ` [PATCH 1/9] staging: rtl8723bs: remove extra blank lines Marc Finkelbaum
2026-04-14 11:45 ` Andy Shevchenko
2026-04-14 9:58 ` [PATCH 2/9] staging: rtl8723bs: fix space-before-tab whitespace Marc Finkelbaum
2026-04-14 11:48 ` Andy Shevchenko
2026-04-14 9:58 ` [PATCH 3/9] staging: rtl8723bs: fix block comment alignment Marc Finkelbaum
2026-04-14 11:51 ` Andy Shevchenko
2026-04-14 9:58 ` [PATCH 4/9] staging: rtl8723bs: add spaces around binary operators Marc Finkelbaum
2026-04-14 11:58 ` Andy Shevchenko
2026-04-14 9:58 ` [PATCH 5/9] staging: rtl8723bs: add space before inline block comments Marc Finkelbaum
2026-04-14 12:12 ` Andy Shevchenko
2026-04-14 9:58 ` [PATCH 6/9] staging: rtl8723bs: fix Yoda conditions and == false comparisons Marc Finkelbaum
2026-04-14 12:21 ` Andy Shevchenko
2026-04-14 18:25 ` Luka Gejak
2026-04-14 9:58 ` [PATCH 7/9] staging: rtl8723bs: reformat multi-line function signatures Marc Finkelbaum
2026-04-14 9:58 ` [PATCH 8/9] staging: rtl8723bs: reformat switch-case blocks with braced bodies Marc Finkelbaum
2026-04-14 9:58 ` Marc Finkelbaum [this message]
2026-04-14 12:31 ` [PATCH 9/9] staging: rtl8723bs: wrap long lines and fix argument alignment Andy Shevchenko
2026-04-14 16:08 ` [PATCH 0/9] staging: rtl8723bs: coding style cleanup in hal_com.c regpac youtube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260414095833.76480-10-regpacy@gmail.com \
--to=regpacy@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.carpenter@linaro.org \
--cc=ethantidmore06@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.