* [PATCH v7 1/3] staging: rtl8723bs: shorten long lines in hal/sdio_halinit.c
2026-05-22 13:19 [PATCH v7 0/3] staging: rtl8723bs: fix several style issues in hal/sdio_halinit.c artur.ugnivenko
@ 2026-05-22 13:19 ` artur.ugnivenko
2026-05-22 13:20 ` [PATCH v7 2/3] staging: rtl8723bs: fix inconsistent braces " artur.ugnivenko
2026-05-22 14:27 ` [PATCH v7 3/3] staging: rtl8723bs: fix lines ending in parentheses " artur.ugnivenko
2 siblings, 0 replies; 5+ messages in thread
From: artur.ugnivenko @ 2026-05-22 13:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, ahmet, error27, Artur Ugnivenko
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Fix checkpatch warnings on lines above 100 chars in length by splitting
long function calls and long comments into multiple lines.
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v7: Add changelog.
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: No changes in this patch.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make the patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 52 ++++++++++++++++----
1 file changed, 42 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index ed9b8fb07fec..43f9c45967f4 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -27,7 +27,11 @@ static u8 CardEnable(struct adapter *padapter)
/* unlock ISO/CLK/Power control register */
rtw_write8(padapter, REG_RSV_CTRL, 0x0);
- ret = HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_enable_flow);
+ ret = HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_card_enable_flow);
if (ret == _SUCCESS) {
bMacPwrCtrlOn = true;
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
@@ -104,7 +108,11 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)
}
/* Tx Page FIFO threshold */
-static void _init_available_page_threshold(struct adapter *padapter, u8 numHQ, u8 numNQ, u8 numLQ, u8 numPubQ)
+static void _init_available_page_threshold(struct adapter *padapter,
+ u8 numHQ,
+ u8 numNQ,
+ u8 numLQ,
+ u8 numPubQ)
{
u16 HQ_threshold, NQ_threshold, LQ_threshold;
@@ -781,7 +789,11 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)
restore_iqk_rst = pwrpriv->bips_processing;
b2Ant = pHalData->EEPROMBluetoothAntNum == Ant_x2;
- PHY_IQCalibrate_8723B(padapter, false, restore_iqk_rst, b2Ant, pHalData->ant_path);
+ PHY_IQCalibrate_8723B(padapter,
+ false,
+ restore_iqk_rst,
+ b2Ant,
+ pHalData->ant_path);
pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
hal_btcoex_IQKNotify(padapter, false);
@@ -812,7 +824,11 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
u8 bMacPwrCtrlOn;
/* Run LPS WL RFOFF flow */
- HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_enter_lps_flow);
+ HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_enter_lps_flow);
/* ==== Reset digital sequence ====== */
@@ -841,7 +857,11 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
bMacPwrCtrlOn = false; /* Disable CMD53 R/W */
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
- HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
+ HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_card_disable_flow);
}
u32 rtl8723bs_hal_deinit(struct adapter *padapter)
@@ -853,7 +873,10 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)
u8 val8 = 0;
rtl8723b_set_FwPwrModeInIPS_cmd(padapter, 0x3);
- /* poll 0x1cc to make sure H2C command already finished by FW; MAC_0x1cc = 0 means H2C done by FW. */
+ /*
+ * poll 0x1cc to make sure H2C command already finished by FW;
+ * MAC_0x1cc = 0 means H2C done by FW.
+ */
do {
val8 = rtw_read8(padapter, REG_HMETFR);
cnt++;
@@ -862,10 +885,13 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)
/* H2C done, enter 32k */
if (val8 == 0) {
/* set rpwm to enter 32k */
- val8 = rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1);
+ val8 = rtw_read8(padapter,
+ SDIO_LOCAL_BASE | SDIO_REG_HRPWM1);
val8 += 0x80;
val8 |= BIT(0);
- rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8);
+ rtw_write8(padapter,
+ SDIO_LOCAL_BASE | SDIO_REG_HRPWM1,
+ val8);
adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80;
cnt = val8 = 0;
do {
@@ -1063,8 +1089,14 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
_ReadPROMContent(padapter);
if (!padapter->hw_init_completed) {
- rtw_write8(padapter, 0x67, 0x00); /* for BT, Switch Ant control to BT */
- CardDisableRTL8723BSdio(padapter);/* for the power consumption issue, wifi ko module is loaded during booting, but wifi GUI is off */
+ /* for BT, Switch Ant control to BT */
+ rtw_write8(padapter, 0x67, 0x00);
+
+ /*
+ * for the power consumption issue, wifi ko module is loaded during booting,
+ * but wifi GUI is off
+ */
+ CardDisableRTL8723BSdio(padapter);
}
return _SUCCESS;
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v7 2/3] staging: rtl8723bs: fix inconsistent braces in hal/sdio_halinit.c
2026-05-22 13:19 [PATCH v7 0/3] staging: rtl8723bs: fix several style issues in hal/sdio_halinit.c artur.ugnivenko
2026-05-22 13:19 ` [PATCH v7 1/3] staging: rtl8723bs: shorten long lines " artur.ugnivenko
@ 2026-05-22 13:20 ` artur.ugnivenko
2026-05-22 14:27 ` [PATCH v7 3/3] staging: rtl8723bs: fix lines ending in parentheses " artur.ugnivenko
2 siblings, 0 replies; 5+ messages in thread
From: artur.ugnivenko @ 2026-05-22 13:20 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, ahmet, error27, Artur Ugnivenko
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Fix checkpatch warnings on inconsistent braces around if/else statements
in hal/sdio_halinit.c
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v7: Add changelog.
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: Fix long line checkpatch warning.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 43f9c45967f4..6f2aea984b30 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -36,8 +36,9 @@ static u8 CardEnable(struct adapter *padapter)
bMacPwrCtrlOn = true;
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
}
- } else
+ } else {
ret = _SUCCESS;
+ }
return ret;
}
@@ -1011,8 +1012,9 @@ static void Hal_EfuseParseBoardType_8723BS(
pHalData->BoardType = (hwinfo[EEPROM_RF_BOARD_OPTION_8723B] & 0xE0) >> 5;
if (pHalData->BoardType == 0xFF)
pHalData->BoardType = (EEPROM_DEFAULT_BOARD_OPTION & 0xE0) >> 5;
- } else
+ } else {
pHalData->BoardType = 0;
+ }
}
static void _ReadEfuseInfo8723BS(struct adapter *padapter)
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v7 3/3] staging: rtl8723bs: fix lines ending in parentheses in hal/sdio_halinit.c
2026-05-22 13:19 [PATCH v7 0/3] staging: rtl8723bs: fix several style issues in hal/sdio_halinit.c artur.ugnivenko
2026-05-22 13:19 ` [PATCH v7 1/3] staging: rtl8723bs: shorten long lines " artur.ugnivenko
2026-05-22 13:20 ` [PATCH v7 2/3] staging: rtl8723bs: fix inconsistent braces " artur.ugnivenko
@ 2026-05-22 14:27 ` artur.ugnivenko
2026-05-24 9:01 ` Dan Carpenter
2 siblings, 1 reply; 5+ messages in thread
From: artur.ugnivenko @ 2026-05-22 14:27 UTC (permalink / raw)
To: gregkh; +Cc: ahmet, error27, linux-kernel, linux-staging, Artur Ugnivenko
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Fix checkpatch warnings on lines that end in patentheses in
hal/sdio_halinit.c.
In _InitNormalChipRegPriority specifically pack all of the
queues into a struct, to pass that as one argument instead of
six individual values, so that those lines can be shortened and
not end in parentheses.
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v7:
- Add changelog.
- Add transmit_queues struct in include/drv_types.h to improve
style of _InitNormalChipRegPriority
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: No changes in this patch.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 110 +++++++++---------
drivers/staging/rtl8723bs/include/drv_types.h | 9 ++
2 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 6f2aea984b30..81cd5b315bb7 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -188,25 +188,18 @@ static void _InitTxBufferBoundary(struct adapter *padapter)
rtw_write8(padapter, REG_TDECTRL + 1, txpktbuf_bndy);
}
-static void _InitNormalChipRegPriority(
- struct adapter *Adapter,
- u16 beQ,
- u16 bkQ,
- u16 viQ,
- u16 voQ,
- u16 mgtQ,
- u16 hiQ
-)
+static void _InitNormalChipRegPriority(struct adapter *Adapter,
+ struct transmit_queues queues)
{
u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7);
value16 |=
- _TXDMA_BEQ_MAP(beQ) |
- _TXDMA_BKQ_MAP(bkQ) |
- _TXDMA_VIQ_MAP(viQ) |
- _TXDMA_VOQ_MAP(voQ) |
- _TXDMA_MGQ_MAP(mgtQ) |
- _TXDMA_HIQ_MAP(hiQ);
+ _TXDMA_BEQ_MAP(queues.beQ) |
+ _TXDMA_BKQ_MAP(queues.bkQ) |
+ _TXDMA_VIQ_MAP(queues.viQ) |
+ _TXDMA_VOQ_MAP(queues.voQ) |
+ _TXDMA_MGQ_MAP(queues.mgtQ) |
+ _TXDMA_HIQ_MAP(queues.hiQ);
rtw_write16(Adapter, REG_TRXDMA_CTRL, value16);
}
@@ -231,17 +224,23 @@ static void _InitNormalChipOneOutEpPriority(struct adapter *Adapter)
break;
}
- _InitNormalChipRegPriority(
- Adapter, value, value, value, value, value, value
- );
+ struct transmit_queues queues = {
+ .beQ = value,
+ .bkQ = value,
+ .viQ = value,
+ .voQ = value,
+ .mgtQ = value,
+ .hiQ = value,
+ };
+ _InitNormalChipRegPriority(Adapter, queues);
}
static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
struct registry_priv *pregistrypriv = &Adapter->registrypriv;
- u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
+ struct transmit_queues queues;
u16 valueHi = 0;
u16 valueLow = 0;
@@ -264,49 +263,48 @@ static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
}
if (!pregistrypriv->wifi_spec) {
- beQ = valueLow;
- bkQ = valueLow;
- viQ = valueHi;
- voQ = valueHi;
- mgtQ = valueHi;
- hiQ = valueHi;
+ queues.beQ = valueLow;
+ queues.bkQ = valueLow;
+ queues.viQ = valueHi;
+ queues.voQ = valueHi;
+ queues.mgtQ = valueHi;
+ queues.hiQ = valueHi;
} else {
/* for WMM , CONFIG_OUT_EP_WIFI_MODE */
- beQ = valueLow;
- bkQ = valueHi;
- viQ = valueHi;
- voQ = valueLow;
- mgtQ = valueHi;
- hiQ = valueHi;
+ queues.beQ = valueLow;
+ queues.bkQ = valueHi;
+ queues.viQ = valueHi;
+ queues.voQ = valueLow;
+ queues.mgtQ = valueHi;
+ queues.hiQ = valueHi;
}
- _InitNormalChipRegPriority(Adapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
-
+ _InitNormalChipRegPriority(Adapter, queues);
}
static void _InitNormalChipThreeOutEpPriority(struct adapter *padapter)
{
struct registry_priv *pregistrypriv = &padapter->registrypriv;
- u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
+ struct transmit_queues queues;
if (!pregistrypriv->wifi_spec) {
/* typical setting */
- beQ = QUEUE_LOW;
- bkQ = QUEUE_LOW;
- viQ = QUEUE_NORMAL;
- voQ = QUEUE_HIGH;
- mgtQ = QUEUE_HIGH;
- hiQ = QUEUE_HIGH;
+ queues.beQ = QUEUE_LOW;
+ queues.bkQ = QUEUE_LOW;
+ queues.viQ = QUEUE_NORMAL;
+ queues.voQ = QUEUE_HIGH;
+ queues.mgtQ = QUEUE_HIGH;
+ queues.hiQ = QUEUE_HIGH;
} else {
/* for WMM */
- beQ = QUEUE_LOW;
- bkQ = QUEUE_NORMAL;
- viQ = QUEUE_NORMAL;
- voQ = QUEUE_HIGH;
- mgtQ = QUEUE_HIGH;
- hiQ = QUEUE_HIGH;
+ queues.beQ = QUEUE_LOW;
+ queues.bkQ = QUEUE_NORMAL;
+ queues.viQ = QUEUE_NORMAL;
+ queues.voQ = QUEUE_HIGH;
+ queues.mgtQ = QUEUE_HIGH;
+ queues.hiQ = QUEUE_HIGH;
}
- _InitNormalChipRegPriority(padapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
+ _InitNormalChipRegPriority(padapter, queues);
}
static void _InitQueuePriority(struct adapter *Adapter)
@@ -988,9 +986,9 @@ static void _ReadRFType(struct adapter *Adapter)
pHalData->rf_chip = RF_6052;
}
-static void Hal_EfuseParseMACAddr_8723BS(
- struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail
-)
+static void Hal_EfuseParseMACAddr_8723BS(struct adapter *padapter,
+ u8 *hwinfo,
+ bool AutoLoadFail)
{
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
@@ -1002,9 +1000,9 @@ static void Hal_EfuseParseMACAddr_8723BS(
}
}
-static void Hal_EfuseParseBoardType_8723BS(
- struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail
-)
+static void Hal_EfuseParseBoardType_8723BS(struct adapter *padapter,
+ u8 *hwinfo,
+ bool AutoLoadFail)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
@@ -1192,9 +1190,9 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int l
/* Description: */
/* Query setting of specified variable. */
/* */
-u8 GetHalDefVar8723BSDIO(
- struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue
-)
+u8 GetHalDefVar8723BSDIO(struct adapter *Adapter,
+ enum hal_def_variable eVariable,
+ void *pValue)
{
u8 bResult = _SUCCESS;
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 552d0c5fa47f..82dbe5553811 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -373,6 +373,15 @@ struct adapter {
unsigned char in_cta_test;
};
+struct transmit_queues {
+ u16 beQ;
+ u16 bkQ;
+ u16 viQ;
+ u16 voQ;
+ u16 mgtQ;
+ u16 hiQ;
+};
+
#define adapter_to_dvobj(adapter) (adapter->dvobj)
#define adapter_to_pwrctl(adapter) (dvobj_to_pwrctl(adapter->dvobj))
#define adapter_wdev_data(adapter) (&((adapter)->wdev_data))
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v7 3/3] staging: rtl8723bs: fix lines ending in parentheses in hal/sdio_halinit.c
2026-05-22 14:27 ` [PATCH v7 3/3] staging: rtl8723bs: fix lines ending in parentheses " artur.ugnivenko
@ 2026-05-24 9:01 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2026-05-24 9:01 UTC (permalink / raw)
To: artur.ugnivenko; +Cc: gregkh, ahmet, linux-kernel, linux-staging
On Fri, May 22, 2026 at 04:27:00PM +0200, artur.ugnivenko@gmx.de wrote:
> From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
>
> Fix checkpatch warnings on lines that end in patentheses in
> hal/sdio_halinit.c.
>
> In _InitNormalChipRegPriority specifically pack all of the
> queues into a struct, to pass that as one argument instead of
> six individual values, so that those lines can be shortened and
> not end in parentheses.
>
> Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
> ---
This is a grab bag of changes.
The new code is CamelCase.
I'm not sure it's really nicer than the old code.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread