Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: rtl8712: r8712_set_chplan_cmd(): Change return type 



Change return type of function r8712_set_chplan_cmd from u8 to void as
its return value is never stored, checked or otherwise used. Change the
return statements accordingly.

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

drivers/staging/rtl8712/rtl871x_cmd.c

+3 −4
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset) 
	return 0;

}



u8 r8712_set_chplan_cmd(struct _adapter *padapter, int chplan)

void r8712_set_chplan_cmd(struct _adapter *padapter, int chplan)

{

	struct cmd_obj *ph2c;

	struct SetChannelPlan_param *psetchplanpara;
@@ -268,17 +268,16 @@ u8 r8712_set_chplan_cmd(struct _adapter *padapter, int chplan) 


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

	if (!ph2c)

		return _FAIL;

		return;

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

	if (!psetchplanpara) {

		kfree(ph2c);

		return _FAIL;

		return;

	}

	init_h2fwcmd_w_parm_no_rsp(ph2c, psetchplanpara,

				GEN_CMD_CODE(_SetChannelPlan));

	psetchplanpara->ChannelPlan = chplan;

	r8712_enqueue_cmd(pcmdpriv, ph2c);

	return _SUCCESS;

}



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

drivers/staging/rtl8712/rtl871x_cmd.h

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

		 enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);

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

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

void 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);

u8 r8712_setrfintfs_cmd(struct _adapter *padapter, u8 mode);