Remove led_blink_hdl and other related symbols
v3 cover Remove led_blink_hdl and other related symbols
Removed useless led_blink_hdl() prototype and definition. Removed struct LedBlink_param. Removed LedBlink entries in rtw_cmd_callback[] and in wlancmds[]. Everything related to LedBlink is not anymore needed. Removed extra blank lines in the two mentioned arrays and changend the numbers set in comments for having them in line with the shift.
Fabio M. De Francesco (2):
staging: rtl8723bs: Remove useless led_blink_hdl()
staging: rtl8723bs: Remove everything related with LedBlink
drivers/staging/rtl8723bs/core/rtw_cmd.c | 27 +++++-------------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 ------- drivers/staging/rtl8723bs/include/rtw_cmd.h | 14 +++------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 4 files changed, 11 insertions(+), 40 deletions(-)
Signature · 1 line
2.31.1
PATCH v3 1/2 staging: rtl8723bs: Remove useless led_blink_hdl()
Removed useless led_blink_hdl() prototype and definition. In wlancmds[] the slot #60 is now set to NULL using the macro GEN_MLME_EXT_HANDLER. This change has not unwanted side effects because the code in rtw_cmd.c checks if the function pointer is valid before using it.
---
Changes from v2: no changes.
Changes from v1: Corrected a bad solution to this issue that made use of an unnecessary dummy function.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 --------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -150,7 +150,7 @@ static struct cmd_hdl wlancmds[] = { GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/ - GEN_MLME_EXT_HANDLER(sizeof(struct LedBlink_param), led_blink_hdl) /*60*/ + GEN_MLME_EXT_HANDLER(0, NULL) /*60*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*61*/GEN_MLME_EXT_HANDLER (sizeof (struct TDLSoption_param ), tdls_hdl)/*62*/
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -9
@@ -6189,15 +6189,6 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf)return H2C_SUCCESS ; } -u8 led_blink_hdl (struct adapter *padapter,unsigned char *pbuf) -{ - -if (!pbuf) -return H2C_PARAMETERS_ERROR ; - -return H2C_SUCCESS ; -} -u8 set_csa_hdl (struct adapter *padapter,unsigned char *pbuf) {return H2C_REJECTED ;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -1
@@ -745,7 +745,6 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf);u8 tx_beacon_hdl (struct adapter *padapter,unsigned char *pbuf);u8 set_ch_hdl (struct adapter *padapter,u8 *pbuf);u8 set_chplan_hdl (struct adapter *padapter,unsigned char *pbuf); -u8 led_blink_hdl (struct adapter *padapter,unsigned char *pbuf);u8 set_csa_hdl (struct adapter *padapter,unsigned char *pbuf);/* Kurt: Handling DFS channel switch announcement ie. */ u8 tdls_hdl (struct adapter *padapter,unsigned char *pbuf);u8 run_in_thread_hdl (struct adapter *padapter,u8 *pbuf);
Signature · 1 line
2.31.1
Re: [Outreachy patch] [PATCH v3 1/2] staging: rtl8723bs: Remove useless led_blink_hdl()
Quoted 4 lines · Fabio M. De Francesco
Removed useless
led_blink_hdl()prototype and definition. In wlancmds[] the slot #60 is now set to NULL using the macroGEN_MLME_EXT_HANDLER. This change has not unwanted side effects because the code inrtw_cmd.cchecks if the function pointer is valid before using it.
When you send the series again, you can change not to no in the above.
julia
Greg Kroah-Hartman
maintainerRe: [Outreachy patch] [PATCH v3 1/2] staging: rtl8723bs: Remove useless led_blink_hdl()
In reply to Fabio M. De FrancescoQuoted 25 lines · Fabio M. De Francesco
Removed useless
led_blink_hdl()prototype and definition. In wlancmds[] the slot #60 is now set to NULL using the macroGEN_MLME_EXT_HANDLER. This change has not unwanted side effects because the code inrtw_cmd.cchecks if the function pointer is valid before using it.Reported-by Julia Lawall <[email protected]>Suggested-by Matthew Wilcox <[email protected]>Suggested-by Dan Carpenter <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>---
Changes from v2: no changes.
Changes from v1: Corrected a bad solution to this issue that made use of an unnecessary dummy function.drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 --------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-)drivers/staging/rtl8723bs/core/rtw_cmd.c +0
-0
drivers/staging/rtl8723bs/core/rtw_cmd.c static struct cmd_hdl wlancmds[] = { · line 153
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +1
-1@@ -150,7 +150,7 @@ static struct cmd_hdl wlancmds[] = { GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/ -GEN_MLME_EXT_HANDLER (sizeof (struct LedBlink_param ), led_blink_hdl)/*60*/ +GEN_MLME_EXT_HANDLER (0 ,NULL )/*60*/
Do not do this "intermediate stage" type thing like this please. This should be one simple patch. Again, look in the kernel archives for an example of how to do this.
thanks,
greg k-h
PATCH v3 2/2 staging: rtl8723bs: Remove everything related with LedBlink
In reply to Fabio M. De FrancescoRemoved struct LedBlink_param. Removed LedBlink entries in rtw_cmd_callback[] and in wlancmds[]. Everything related to LedBlink is not anymore needed. Removed extra blank lines in the two mentioned arrays and changend the numbers set in comments for having them in line with the shift.
---
Changes from v2: Added this patch as 2/2.
Changes from v1: No changes.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 27 ++++++--------------- drivers/staging/rtl8723bs/include/rtw_cmd.h | 14 +++-------- 2 files changed, 11 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +7 -20
@@ -22,7 +22,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_Write_EEPROM), NULL}, {GEN_CMD_CODE(_Read_EFUSE), NULL}, {GEN_CMD_CODE(_Write_EFUSE), NULL}, - {GEN_CMD_CODE(_Read_CAM), NULL}, /*10*/ {GEN_CMD_CODE(_Write_CAM), NULL}, {GEN_CMD_CODE(_setBCNITV), NULL},
@@ -33,7 +32,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SetOpMode), NULL}, {GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback}, /*18*/ {GEN_CMD_CODE(_SetAuth), NULL}, - {GEN_CMD_CODE(_SetKey), NULL}, /*20*/ {GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback}, {GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback},
@@ -44,7 +42,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SetDataRate), NULL}, {GEN_CMD_CODE(_GetDataRate), NULL}, {GEN_CMD_CODE(_SetPhyInfo), NULL}, - {GEN_CMD_CODE(_GetPhyInfo), NULL}, /*30*/ {GEN_CMD_CODE(_SetPhy), NULL}, {GEN_CMD_CODE(_GetPhy), NULL},
@@ -55,7 +52,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_JoinbssRpt), NULL}, {GEN_CMD_CODE(_SetRaTable), NULL}, {GEN_CMD_CODE(_GetRaTable), NULL}, - {GEN_CMD_CODE(_GetCCXReport), NULL}, /*40*/ {GEN_CMD_CODE(_GetDTMReport), NULL}, {GEN_CMD_CODE(_GetTXRateStatistics), NULL},
@@ -67,24 +63,19 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SwitchAntenna), NULL}, {GEN_CMD_CODE(_SetCrystalCap), NULL}, {GEN_CMD_CODE(_SetSingleCarrierTx), NULL}, /*50*/ - {GEN_CMD_CODE(_SetSingleToneTx), NULL}, /*51*/ {GEN_CMD_CODE(_SetCarrierSuppressionTx), NULL}, {GEN_CMD_CODE(_SetContinuousTx), NULL}, {GEN_CMD_CODE(_SwitchBandwidth), NULL}, /*54*/ {GEN_CMD_CODE(_TX_Beacon), NULL},/*55*/ - {GEN_CMD_CODE(_Set_MLME_EVT), NULL},/*56*/ {GEN_CMD_CODE(_Set_Drv_Extra), NULL},/*57*/ {GEN_CMD_CODE(_Set_H2C_MSG), NULL},/*58*/ {GEN_CMD_CODE(_SetChannelPlan), NULL},/*59*/ - {GEN_CMD_CODE(_LedBlink), NULL},/*60*/ - - {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*61*/ - {GEN_CMD_CODE(_TDLS), NULL},/*62*/ - {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*63*/ - - {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*64*/ + {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*60*/ + {GEN_CMD_CODE(_TDLS), NULL},/*61*/ + {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*62*/ + {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*63*/ }; static struct cmd_hdl wlancmds[] = {
@@ -144,17 +135,13 @@ static struct cmd_hdl wlancmds[] = { GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(sizeof(struct Tx_Beacon_param), tx_beacon_hdl) /*55*/ - GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) /*56*/ GEN_MLME_EXT_HANDLER(0, rtw_drvextra_cmd_hdl) /*57*/ - GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/ - GEN_MLME_EXT_HANDLER(0, NULL) /*60*/ - - GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*61*/ - GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*62*/ - GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*63*/ + GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*60*/ + GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*61*/ + GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*62*/ GEN_MLME_EXT_HANDLER(sizeof(struct RunInThread_param), run_in_thread_hdl) /*63*/ };
drivers/staging/rtl8723bs/include/rtw_cmd.h +4 -10
@@ -537,11 +537,6 @@ struct SetChannelPlan_param {u8 channel_plan; }; -/*H2C Handler index: 60 */ -struct LedBlink_param { -void *pLed; -}; -/*H2C Handler index: 61 */ struct SetChannelSwitch_param {u8 new_ch_no;
@@ -709,13 +704,12 @@ enum {GEN_CMD_CODE (_Set_H2C_MSG),/*58*/ GEN_CMD_CODE (_SetChannelPlan),/*59*/ -GEN_CMD_CODE (_LedBlink),/*60*/ -GEN_CMD_CODE (_SetChannelSwitch),/*61*/ -GEN_CMD_CODE (_TDLS),/*62*/ -GEN_CMD_CODE (_ChkBMCSleepq),/*63*/ +GEN_CMD_CODE (_SetChannelSwitch),/*60*/ +GEN_CMD_CODE (_TDLS),/*61*/ +GEN_CMD_CODE (_ChkBMCSleepq),/*62*/ -GEN_CMD_CODE (_RunInThreadCMD),/*64*/ +GEN_CMD_CODE (_RunInThreadCMD),/*63*/ MAX_H2CCMD };
Signature · 1 line
2.31.1
Re: [Outreachy kernel] [PATCH v3 2/2] staging: rtl8723bs: Remove everything related with LedBlink
Quoted 5 lines · Fabio M. De Francesco
Removed struct
LedBlink_param. Removed LedBlink entries in rtw_cmd_callback[] and in wlancmds[]. Everything related to LedBlink is not anymore needed. Removed extra blank lines in the two mentioned arrays and changend the numbers set in comments for having them in line with the shift.
It would be better not to remove the blank lines at the same time. That could be in another patch. It is distracting here.
julia
Quoted 138 lines
Reported-by Fabio Aiuto <[email protected]>Reported-by Greg Kroah-Hartman <[email protected]>Suggested-by Dan Carpenter <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>---
Changes from v2: Added this patch as 2/2.
Changes from v1: No changes.drivers/staging/rtl8723bs/core/rtw_cmd.c | 27 ++++++--------------- drivers/staging/rtl8723bs/include/rtw_cmd.h | 14 +++-------- 2 files changed, 11 insertions(+), 30 deletions(-)drivers/staging/rtl8723bs/core/rtw_cmd.c +7
-20@@ -22,7 +22,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_Write_EEPROM), NULL}, {GEN_CMD_CODE(_Read_EFUSE), NULL}, {GEN_CMD_CODE(_Write_EFUSE), NULL}, - {GEN_CMD_CODE(_Read_CAM), NULL}, /*10*/ {GEN_CMD_CODE(_Write_CAM), NULL}, {GEN_CMD_CODE(_setBCNITV), NULL},@@ -33,7 +32,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SetOpMode), NULL}, {GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback}, /*18*/ {GEN_CMD_CODE(_SetAuth), NULL}, - {GEN_CMD_CODE(_SetKey), NULL}, /*20*/ {GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback}, {GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback},@@ -44,7 +42,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SetDataRate), NULL}, {GEN_CMD_CODE(_GetDataRate), NULL}, {GEN_CMD_CODE(_SetPhyInfo), NULL}, - {GEN_CMD_CODE(_GetPhyInfo), NULL}, /*30*/ {GEN_CMD_CODE(_SetPhy), NULL}, {GEN_CMD_CODE(_GetPhy), NULL},@@ -55,7 +52,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_JoinbssRpt), NULL}, {GEN_CMD_CODE(_SetRaTable), NULL}, {GEN_CMD_CODE(_GetRaTable), NULL}, - {GEN_CMD_CODE(_GetCCXReport), NULL}, /*40*/ {GEN_CMD_CODE(_GetDTMReport), NULL}, {GEN_CMD_CODE(_GetTXRateStatistics), NULL},@@ -67,24 +63,19 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_SwitchAntenna), NULL}, {GEN_CMD_CODE(_SetCrystalCap), NULL}, {GEN_CMD_CODE(_SetSingleCarrierTx), NULL}, /*50*/ - {GEN_CMD_CODE(_SetSingleToneTx), NULL}, /*51*/ {GEN_CMD_CODE(_SetCarrierSuppressionTx), NULL}, {GEN_CMD_CODE(_SetContinuousTx), NULL}, {GEN_CMD_CODE(_SwitchBandwidth), NULL}, /*54*/ {GEN_CMD_CODE(_TX_Beacon), NULL},/*55*/ - {GEN_CMD_CODE(_Set_MLME_EVT), NULL},/*56*/ {GEN_CMD_CODE(_Set_Drv_Extra), NULL},/*57*/ {GEN_CMD_CODE(_Set_H2C_MSG), NULL},/*58*/ {GEN_CMD_CODE(_SetChannelPlan), NULL},/*59*/ - {GEN_CMD_CODE(_LedBlink), NULL},/*60*/ - - {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*61*/ - {GEN_CMD_CODE(_TDLS), NULL},/*62*/ - {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*63*/ - - {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*64*/ + {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*60*/ + {GEN_CMD_CODE(_TDLS), NULL},/*61*/ + {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*62*/ + {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*63*/ }; static struct cmd_hdl wlancmds[] = {@@ -144,17 +135,13 @@ static struct cmd_hdl wlancmds[] = { GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(sizeof(struct Tx_Beacon_param), tx_beacon_hdl) /*55*/ - GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) /*56*/ GEN_MLME_EXT_HANDLER(0, rtw_drvextra_cmd_hdl) /*57*/ - GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/ - GEN_MLME_EXT_HANDLER(0, NULL) /*60*/ - - GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*61*/ - GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*62*/ - GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*63*/ + GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*60*/ + GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*61*/ + GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*62*/ GEN_MLME_EXT_HANDLER(sizeof(struct RunInThread_param), run_in_thread_hdl) /*63*/ };drivers/staging/rtl8723bs/include/rtw_cmd.h +4
-11@@ -537,11 +537,6 @@ struct SetChannelPlan_param {u8 channel_plan; }; -/*H2C Handler index: 60 */ -struct LedBlink_param { -void *pLed; -}; -/*H2C Handler index: 61 */ struct SetChannelSwitch_param {u8 new_ch_no;@@ -709,13 +704,12 @@ enum {GEN_CMD_CODE (_Set_H2C_MSG),/*58*/ GEN_CMD_CODE (_SetChannelPlan),/*59*/ -GEN_CMD_CODE (_LedBlink),/*60*/ -GEN_CMD_CODE (_SetChannelSwitch),/*61*/ -GEN_CMD_CODE (_TDLS),/*62*/ -GEN_CMD_CODE (_ChkBMCSleepq),/*63*/ +GEN_CMD_CODE (_SetChannelSwitch),/*60*/ +GEN_CMD_CODE (_TDLS),/*61*/ +GEN_CMD_CODE (_ChkBMCSleepq),/*62*/ -GEN_CMD_CODE (_RunInThreadCMD),/*64*/ +GEN_CMD_CODE (_RunInThreadCMD),/*63*/ MAX_H2CCMD }; --2.31.1
Greg Kroah-Hartman
maintainerRe: [Outreachy kernel] [PATCH v3 2/2] staging: rtl8723bs: Remove everything related with LedBlink
In reply to Fabio M. De FrancescoQuoted 24 lines · Fabio M. De Francesco
Removed struct
LedBlink_param. Removed LedBlink entries in rtw_cmd_callback[] and in wlancmds[]. Everything related to LedBlink is not anymore needed. Removed extra blank lines in the two mentioned arrays and changend the numbers set in comments for having them in line with the shift.Reported-by Fabio Aiuto <[email protected]>Reported-by Greg Kroah-Hartman <[email protected]>Suggested-by Dan Carpenter <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>---
Changes from v2: Added this patch as 2/2.
Changes from v1: No changes.drivers/staging/rtl8723bs/core/rtw_cmd.c | 27 ++++++--------------- drivers/staging/rtl8723bs/include/rtw_cmd.h | 14 +++-------- 2 files changed, 11 insertions(+), 30 deletions(-)drivers/staging/rtl8723bs/core/rtw_cmd.c +0
-0
drivers/staging/rtl8723bs/core/rtw_cmd.c static struct _cmd_callback rtw_cmd_callback[] = { · line 27
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +0
-1@@ -22,7 +22,6 @@ static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_Write_EEPROM), NULL}, {GEN_CMD_CODE(_Read_EFUSE), NULL}, {GEN_CMD_CODE(_Write_EFUSE), NULL}, - {GEN_CMD_CODE(_Read_CAM), NULL}, /*10*/ {GEN_CMD_CODE(_Write_CAM), NULL}, {GEN_CMD_CODE(_setBCNITV), NULL},
These blank lines are there for a reason, please do not remove them.
thanks,
gre gk-h