OSDN Git Service

staging: rtl8712: r8712_setstakey_cmd(): Change return type
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Thu, 20 Jun 2019 11:53:03 +0000 (17:23 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2019 12:47:29 +0000 (14:47 +0200)
Change return type of function r8712_setstakey_cmd() to void as its
return value is never stored, checked, or otherwise used.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl871x_cmd.c
drivers/staging/rtl8712/rtl871x_cmd.h

index 48f7d21..9832230 100644 (file)
@@ -604,7 +604,7 @@ void r8712_setopmode_cmd(struct _adapter *padapter,
        r8712_enqueue_cmd(pcmdpriv, ph2c);
 }
 
-u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
+void r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
 {
        struct cmd_obj *ph2c;
        struct set_stakey_parm *psetstakey_para;
@@ -616,17 +616,17 @@ u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
 
        ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);
        if (!ph2c)
-               return _FAIL;
+               return;
        psetstakey_para = kmalloc(sizeof(*psetstakey_para), GFP_ATOMIC);
        if (!psetstakey_para) {
                kfree(ph2c);
-               return _FAIL;
+               return;
        }
        psetstakey_rsp = kmalloc(sizeof(*psetstakey_rsp), GFP_ATOMIC);
        if (!psetstakey_rsp) {
                kfree(ph2c);
                kfree(psetstakey_para);
-               return _FAIL;
+               return;
        }
        init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_);
        ph2c->rsp = (u8 *) psetstakey_rsp;
@@ -645,7 +645,6 @@ u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
                        &psecuritypriv->XGrpKey[
                        psecuritypriv->XGrpKeyid - 1]. skey, 16);
        r8712_enqueue_cmd(pcmdpriv, ph2c);
-       return _SUCCESS;
 }
 
 u8 r8712_setrfintfs_cmd(struct _adapter *padapter, u8 mode)
index d296ace..814659d 100644 (file)
@@ -713,7 +713,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr);
 u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
                        struct ndis_802_11_ssid *pssid);
 int r8712_createbss_cmd(struct _adapter *padapter);
-u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key);
+void r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key);
 int r8712_joinbss_cmd(struct _adapter *padapter,
                      struct wlan_network *pnetwork);
 void r8712_disassoc_cmd(struct _adapter *padapter);