staging: rtl8712: Move similar execution in to a function.
PATCH 1/1 staging: rtl8712: Move similar execution in to a function.
Move the common execution for read_macreg_hdl, write_macreg_hdl, write_bbreg_hdl and write_rfreg_hdl in to a new function common_read_write_hdl.
--- drivers/staging/rtl8712/rtl8712_cmd.c | 41 +++++++-------------------- 1 file changed, 11 insertions(+), 30 deletions(-)
drivers/staging/rtl8712/rtl8712_cmd.c +11 -30
@@ -117,9 +117,9 @@ static void r871x_internal_cmd_hdl(struct _adapter *padapter, u8 *pbuf)kfree (pdrvcmd->pbuf); } -static u8 read_macreg_hdl (struct _adapter *padapter,u8 *pbuf) +static u8 common_read_write_hdl (struct _adapter *padapter,u8 *pbuf) { -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd); +void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd);struct cmd_obj *pcmd = (struct cmd_obj *)pbuf;/* invoke cmd->callback function */
@@ -129,20 +129,17 @@ static u8 read_macreg_hdl(struct _adapter *padapter, u8 *pbuf)else pcmd_callback (padapter, pcmd);return H2C_SUCCESS ; + } -static u8 write_macreg_hdl (struct _adapter *padapter,u8 *pbuf) +static u8 read_macreg_hdl (struct _adapter *padapter,u8 *pbuf) { -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd); -struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; +return common_read_write_hdl (padapter, pbuf); +} -/* invoke cmd->callback function */ - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; -if (!pcmd_callback) -r8712_free_cmd_obj (pcmd); -else -pcmd_callback (padapter, pcmd); -return H2C_SUCCESS ; +static u8 write_macreg_hdl (struct _adapter *padapter,u8 *pbuf) +{ +return common_read_write_hdl (padapter, pbuf); }static u8 read_bbreg_hdl (struct _adapter *padapter,u8 *pbuf)
@@ -155,15 +152,7 @@ static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)static u8 write_bbreg_hdl (struct _adapter *padapter,u8 *pbuf) { -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd); -struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; - - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; -if (!pcmd_callback) -r8712_free_cmd_obj (pcmd); -else -pcmd_callback (padapter, pcmd); -return H2C_SUCCESS ; +return common_read_write_hdl (padapter, pbuf); }static u8 read_rfreg_hdl (struct _adapter *padapter,u8 *pbuf)
@@ -184,15 +173,7 @@ static u8 read_rfreg_hdl(struct _adapter *padapter, u8 *pbuf)static u8 write_rfreg_hdl (struct _adapter *padapter,u8 *pbuf) { -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd); -struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; - - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; -if (!pcmd_callback) -r8712_free_cmd_obj (pcmd); -else -pcmd_callback (padapter, pcmd); -return H2C_SUCCESS ; +return common_read_write_hdl (padapter, pbuf); }static u8 sys_suspend_hdl (struct _adapter *padapter,u8 *pbuf)
--
2.32.0
Greg KH
maintainerQuoted 3 lines · Saurav Girepunje
Move the common execution for
read_macreg_hdl,write_macreg_hdl,write_bbreg_hdlandwrite_rfreg_hdlin to a new functioncommon_read_write_hdl.
You said _what_ you did here, but not _why_ you did this.
I can't easily see why you did this, please explain it better in the next version of this patch.
thanks,
greg k-h
Quoted 5 lines · Greg KH
Quoted 3 lines · Saurav Girepunje
Move the common execution for
read_macreg_hdl,write_macreg_hdl,write_bbreg_hdlandwrite_rfreg_hdlin to a new functioncommon_read_write_hdl.
Quoted 9 lines
You said _what_ you did here, but not _why_ you did this.
I can't easily see why you did this, please explain it better in the next version of this patch.
thanks,
greg k-h
Ok, I will add explanation and send next version.
Thanks for review greg.
Regards,
Saurav Girepunje