staging: rtl8712: Change return values of r8712_getrfreg_cmd()

Change return values of r8712_getrfreg_cmd from _SUCCESS/_FAIL to
0/-ENOMEM respectively. Modify call site accordingly.

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

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index cfd09718777f75b29c15b5e418d95a7cc8786b56..436b5ee619e7365076b1f9cd1fe1f9610701a62d 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -280,7 +280,7 @@ int r8712_setrfreg_cmd(struct _adapter  *padapter, u8 offset, u32 val)
        return 0;
 }
 
-u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
+int r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
 {
        struct cmd_obj *ph2c;
        struct readRF_parm *prdrfparm;
@@ -288,11 +288,11 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
 
        ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);
        if (!ph2c)
-               return _FAIL;
+               return -ENOMEM;
        prdrfparm = kmalloc(sizeof(*prdrfparm), GFP_ATOMIC);
        if (!prdrfparm) {
                kfree(ph2c);
-               return _FAIL;
+               return -ENOMEM;
        }
        INIT_LIST_HEAD(&ph2c->list);
        ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg);
@@ -302,7 +302,7 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
        ph2c->rspsz = sizeof(struct readRF_rsp);
        prdrfparm->offset = offset;
        r8712_enqueue_cmd(pcmdpriv, ph2c);
-       return _SUCCESS;
+       return 0;
 }
 
 void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index 6b004ce330d54e4441d8db4f5a42fa633d9fc44f..98d7fbfce1a57de3ab1ec1ac92d62e8006def74f 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -720,7 +720,7 @@ 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);
-u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval);
+int r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval);
 int r8712_setrfreg_cmd(struct _adapter  *padapter, u8 offset, u32 val);
 void r8712_addbareq_cmd(struct _adapter *padapter, u8 tid);
 void r8712_wdg_wk_cmd(struct _adapter *padapter);

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 861bbafac8670ab57cadd49098a6058d2cfe944f..b78101afc93d3a86b8983718906a8a991858361a 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -467,7 +467,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
                 * RegDataWidth = *((unsigned long *)InformationBuffer+1);
                 * RegDataValue =  *((unsigned long *)InformationBuffer+2);
                 */
-                       if (!r8712_getrfreg_cmd(Adapter,
+                       if (r8712_getrfreg_cmd(Adapter,
                            *(unsigned char *)poid_par_priv->information_buf,
                            (unsigned char *)&Adapter->mppriv.workparam.io_value
                            ))