staging: rtl8712: r8712_setopmode_cmd(): Change return type [Linux 5.3]

This Linux kernel change "staging: rtl8712: r8712_setopmode_cmd(): Change return type" is included in the Linux 5.3 release. This change is authored by Nishka Dasgupta <nishkadg.linux [at] gmail.com> on Thu Jun 20 17:23:02 2019 +0530. The commit for this change in Linux stable tree is 612168e (patch).

staging: rtl8712: r8712_setopmode_cmd(): Change return type

Change return type of function r8712_setopmode_cmd() from u8 to void as
its return value is never stored or checked or otherwise used.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

There are 9 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/rtl8712/rtl871x_cmd.c | 7 +++----
 drivers/staging/rtl8712/rtl871x_cmd.h | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index c1d032d..48f7d21 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -583,7 +583,7 @@ void r8712_disassoc_cmd(struct _adapter *padapter) /* for sta_mode */
    r8712_enqueue_cmd(pcmdpriv, pdisconnect_cmd);
 }

-u8 r8712_setopmode_cmd(struct _adapter *padapter,
+void r8712_setopmode_cmd(struct _adapter *padapter,
         enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
 {
    struct cmd_obj *ph2c;
@@ -593,16 +593,15 @@ u8 r8712_setopmode_cmd(struct _adapter *padapter,

    ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);
    if (!ph2c)
-       return _FAIL;
+       return;
    psetop = kmalloc(sizeof(*psetop), GFP_ATOMIC);
    if (!psetop) {
        kfree(ph2c);
-       return _FAIL;
+       return;
    }
    init_h2fwcmd_w_parm_no_rsp(ph2c, psetop, _SetOpMode_CMD_);
    psetop->mode = (u8)networktype;
    r8712_enqueue_cmd(pcmdpriv, ph2c);
-   return _SUCCESS;
 }

 u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index 9ad364f..d296ace 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -717,7 +717,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
 int r8712_joinbss_cmd(struct _adapter *padapter,
              struct wlan_network *pnetwork);
 void r8712_disassoc_cmd(struct _adapter *padapter);
-u8 r8712_setopmode_cmd(struct _adapter *padapter,
+void r8712_setopmode_cmd(struct _adapter *padapter,
         enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
 int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);
 void r8712_set_chplan_cmd(struct _adapter  *padapter, int chplan);

Leave a Reply

Your email address will not be published. Required fields are marked *