Commit 1f1e1301 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Change return values of r8712_setdatarate_cmd() 



Change the return values of function r8712_setdatarate_cmd from _SUCCESS
and _FAIL to 0 and -ENOMEM respectively.
Change the return type of the function from u8 to int to reflect this.
Change the call site of the function to check for 0 instead of _SUCCESS.
Return the value at the call site directly instead of storing it in a
return variable.
Remove now-unused return variable.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c77a6794

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter, 
	return _SUCCESS;

}



u8 r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset)

int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset)

{

	struct cmd_obj		*ph2c;

	struct setdatarate_parm	*pbsetdataratepara;
@@ -250,18 +250,18 @@ u8 r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset) 


	ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c)

		return _FAIL;

		return -ENOMEM;

	pbsetdataratepara = kmalloc(sizeof(*pbsetdataratepara), GFP_ATOMIC);

	if (!pbsetdataratepara) {

		kfree(ph2c);

		return _FAIL;

		return -ENOMEM;

	}

	init_h2fwcmd_w_parm_no_rsp(ph2c, pbsetdataratepara,

				   GEN_CMD_CODE(_SetDataRate));

	pbsetdataratepara->mac_id = 5;

	memcpy(pbsetdataratepara->datarates, rateset, NumRates);

	r8712_enqueue_cmd(pcmdpriv, ph2c);

	return _SUCCESS;

	return 0;

}



u8 r8712_set_chplan_cmd(struct _adapter *padapter, int chplan)

drivers/staging/rtl8712/rtl871x_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, 
u8 r8712_disassoc_cmd(struct _adapter *padapter);

u8 r8712_setopmode_cmd(struct _adapter *padapter,

		 enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);

u8 r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);

int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);

u8 r8712_set_chplan_cmd(struct _adapter  *padapter, int chplan);

u8 r8712_setbasicrate_cmd(struct _adapter *padapter, u8 *rateset);

u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval);

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+2 −4
Original line number Diff line number Diff line
@@ -1309,7 +1309,7 @@ static int r8711_wx_set_rate(struct net_device *dev, 
	u32 ratevalue = 0;

	u8 datarates[NumRates];

	u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};

	int i, ret = 0;

	int i;



	if (target_rate == -1) {

		ratevalue = 11;
@@ -1367,9 +1367,7 @@ static int r8711_wx_set_rate(struct net_device *dev, 
			datarates[i] = 0xff;

		}

	}

	if (r8712_setdatarate_cmd(padapter, datarates) != _SUCCESS)

		ret = -ENOMEM;

	return ret;

	return r8712_setdatarate_cmd(padapter, datarates);

}



static int r8711_wx_get_rate(struct net_device *dev,