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

Commit e29d3ebc authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: remove unused variables 



unused variables are removed. These variables were only assigned some
values and after that they were never being used. So they are safe to
be removed , and it has been build tested.

I left a call to r8712_read32(padapter, TCR) and
r8712_read8(padapter, SDIO_HCPWM) .

r8712_read32() and r8712_read8() is ultimately calling usb_read32()
and usb_read8() respectively. and they are again calling
r8712_usbctrl_vendorreq().
this r8712_usbctrl_vendorreq() is communicating through the usb bus
and is sending and receiving the control msg.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eecc515a

drivers/staging/rtl8712/hal_init.c

+2 −7
Original line number Diff line number Diff line
@@ -136,15 +136,10 @@ static void update_fwhdr(struct fw_hdr *pfwhdr, const u8 *pmappedfw) 
static u8 chk_fwhdr(struct fw_hdr *pfwhdr, u32 ulfilelength)

{

	u32	fwhdrsz, fw_sz;

	u8 intf, rfconf;



	/* check signature */

	if ((pfwhdr->signature != 0x8712) && (pfwhdr->signature != 0x8192))

		return _FAIL;

	/* check interface */

	intf = (u8)((pfwhdr->version&0x3000) >> 12);

	/* check rf_conf */

	rfconf = (u8)((pfwhdr->version&0xC000) >> 14);

	/* check fw_priv_sze & sizeof(struct fw_priv) */

	if (pfwhdr->fw_priv_sz != sizeof(struct fw_priv))

		return _FAIL;
@@ -162,7 +157,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) 
	sint i;

	u8 tmp8, tmp8_a;

	u16 tmp16;

	u32 maxlen = 0, tmp32; /* for compare usage */

	u32 maxlen = 0; /* for compare usage */

	uint dump_imem_sz, imem_sz, dump_emem_sz, emem_sz; /* max = 49152; */

	struct fw_hdr fwhdr;

	u32 ulfilelength;	/* FW file size */
@@ -262,7 +257,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) 
		if (tmp8_a != (tmp8|BIT(2)))

			goto exit_fail;



		tmp32 = r8712_read32(padapter, TCR);

		r8712_read32(padapter, TCR);



		/* 4.polling IMEM Ready */

		i = 100;

drivers/staging/rtl8712/ieee80211.c

+1 −2
Original line number Diff line number Diff line
@@ -368,13 +368,12 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, 
int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len,

	       u8 *wpa_ie, u16 *wpa_len)

{

	u8 authmode, sec_idx;

	u8 authmode;

	u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};

	uint cnt;



	/*Search required WPA or WPA2 IE and copy to sec_ie[ ]*/

	cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);

	sec_idx = 0;

	while (cnt < in_len) {

		authmode = in_ie[cnt];

		if ((authmode == _WPA_IE_ID_) &&

drivers/staging/rtl8712/rtl8712_cmd.c

+1 −12
Original line number Diff line number Diff line
@@ -157,10 +157,8 @@ static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) 
{

	u32 val;

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj	*pcmd);

	struct readBB_parm *prdbbparm;

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	prdbbparm = (struct readBB_parm *)pcmd->parmbuf;

	if (pcmd->rsp && pcmd->rspsz > 0)

		memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz);

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
@@ -174,10 +172,8 @@ static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) 
static u8 write_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)

{

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);

	struct writeBB_parm *pwritebbparm;

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	pwritebbparm = (struct writeBB_parm *)pcmd->parmbuf;

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;

	if (pcmd_callback == NULL)

		r8712_free_cmd_obj(pcmd);
@@ -190,10 +186,8 @@ static u8 read_rfreg_hdl(struct _adapter *padapter, u8 *pbuf) 
{

	u32 val;

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);

	struct readRF_parm *prdrfparm;

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	prdrfparm = (struct readRF_parm *)pcmd->parmbuf;

	if (pcmd->rsp && pcmd->rspsz > 0)

		memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz);

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
@@ -207,10 +201,8 @@ static u8 read_rfreg_hdl(struct _adapter *padapter, u8 *pbuf) 
static u8 write_rfreg_hdl(struct _adapter *padapter, u8 *pbuf)

{

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);

	struct writeRF_parm *pwriterfparm;

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	pwriterfparm = (struct writeRF_parm *)pcmd->parmbuf;

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;

	if (pcmd_callback == NULL)

		r8712_free_cmd_obj(pcmd);
@@ -222,9 +214,7 @@ static u8 write_rfreg_hdl(struct _adapter *padapter, u8 *pbuf) 
static u8 sys_suspend_hdl(struct _adapter *padapter, u8 *pbuf)

{

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;

	struct usb_suspend_parm *psetusbsuspend;



	psetusbsuspend = (struct usb_suspend_parm *)pcmd->parmbuf;

	r8712_free_cmd_obj(pcmd);

	return H2C_SUCCESS;

}
@@ -320,7 +310,7 @@ void r8712_fw_cmd_data(struct _adapter *pAdapter, u32 *value, u8 flag) 
int r8712_cmd_thread(void *context)

{

	struct cmd_obj *pcmd;

	unsigned int cmdsz, wr_sz, *pcmdbuf, *prspbuf;

	unsigned int cmdsz, wr_sz, *pcmdbuf;

	struct tx_desc *pdesc;

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);

	struct _adapter *padapter = (struct _adapter *)context;
@@ -342,7 +332,6 @@ int r8712_cmd_thread(void *context) 
			continue;

		}

		pcmdbuf = (unsigned int *)pcmdpriv->cmd_buf;

		prspbuf = (unsigned int *)pcmdpriv->rsp_buf;

		pdesc = (struct tx_desc *)pcmdbuf;

		memset(pdesc, 0, TXDESC_SIZE);

		pcmd = cmd_hdl_filter(padapter, pcmd);

drivers/staging/rtl8712/rtl8712_efuse.c

+1 −2
Original line number Diff line number Diff line
@@ -219,13 +219,12 @@ u16 r8712_efuse_get_current_size(struct _adapter *padapter) 
{

	int bContinual = true;

	u16 efuse_addr = 0;

	u8 hoffset = 0, hworden = 0;

	u8 hworden = 0;

	u8 efuse_data, word_cnts = 0;



	while (bContinual && efuse_one_byte_read(padapter, efuse_addr,

	       &efuse_data) && (efuse_addr < efuse_available_max_size)) {

		if (efuse_data != 0xFF) {

			hoffset = (efuse_data >> 4) & 0x0F;

			hworden =  efuse_data & 0x0F;

			word_cnts = calculate_word_cnts(hworden);

			/* read next header */

drivers/staging/rtl8712/rtl8712_recv.c

+2 −13
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ int r8712_free_recvframe(union recv_frame *precvframe, 
static void update_recvframe_attrib_from_recvstat(struct rx_pkt_attrib *pattrib,

					   struct recv_stat *prxstat)

{

	u32 *pphy_info;

	struct phy_stat *pphy_stat;

	u16 drvinfo_sz = 0;



	drvinfo_sz = (le32_to_cpu(prxstat->rxdw0)&0x000f0000)>>16;
@@ -189,10 +187,6 @@ static void update_recvframe_attrib_from_recvstat(struct rx_pkt_attrib *pattrib, 
	/*Offset 16*/

	/*Offset 20*/

	/*phy_info*/

	if (drvinfo_sz) {

		pphy_stat = (struct phy_stat *)(prxstat+1);

		pphy_info = (u32 *)prxstat+1;

	}

}



/*perform defrag*/
@@ -200,7 +194,7 @@ static union recv_frame *recvframe_defrag(struct _adapter *adapter, 
				   struct  __queue *defrag_q)

{

	struct list_head *plist, *phead;

	u8	*data, wlanhdr_offset;

	u8 wlanhdr_offset;

	u8	curfragnum;

	struct recv_frame_hdr *pfhdr, *pnfhdr;

	union recv_frame *prframe, *pnextrframe;
@@ -223,7 +217,6 @@ static union recv_frame *recvframe_defrag(struct _adapter *adapter, 
	curfragnum++;

	plist = &defrag_q->queue;

	plist = plist->next;

	data = get_recvframe_data(prframe);

	while (end_of_queue_search(phead, plist) == false) {

		pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u);

		pnfhdr = &pnextrframe->u.hdr;
@@ -436,13 +429,11 @@ void r8712_rxcmd_event_hdl(struct _adapter *padapter, void *prxcmdbuf) 
{

	uint voffset;

	u8 *poffset;

	u16 pkt_len, cmd_len, drvinfo_sz;

	u8 eid, cmd_seq;

	u16 cmd_len, drvinfo_sz;

	struct recv_stat *prxstat;



	poffset = (u8 *)prxcmdbuf;

	voffset = *(uint *)poffset;

	pkt_len = le32_to_cpu(voffset) & 0x00003fff;

	prxstat = (struct recv_stat *)prxcmdbuf;

	drvinfo_sz = ((le32_to_cpu(prxstat->rxdw0) & 0x000f0000) >> 16);

	drvinfo_sz = drvinfo_sz << 3;
@@ -450,8 +441,6 @@ void r8712_rxcmd_event_hdl(struct _adapter *padapter, void *prxcmdbuf) 
	do {

		voffset  = *(uint *)poffset;

		cmd_len = (u16)(le32_to_cpu(voffset) & 0xffff);

		cmd_seq = (u8)((le32_to_cpu(voffset) >> 24) & 0x7f);

		eid = (u8)((le32_to_cpu(voffset) >> 16) & 0xff);

		r8712_event_handle(padapter, (uint *)poffset);

		poffset += (cmd_len + 8);/*8 bytes alignment*/

	} while (le32_to_cpu(voffset) & BIT(31));