Commit e7b970cc authored Jan 09, 2023 by Martin Kaiser Committed by Greg Kroah-Hartman Jan 17, 2023

staging: r8188eu: voq_cnt is write-only



voq_cnt in struct xmit_priv is initialised, incremented and decremented
but never read. Remove voq_cnt and resulting dead code.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Acked-by: Pavel Skripkin <paskripkin@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230109212852.75612-5-martin@kaiser.cx


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 763f3eff

drivers/staging/r8188eu/core/rtw_xmit.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -194,9 +194,6 @@ int _rtw_init_xmit_priv(struct xmit_priv pxmitpriv, struct adapter padapter)

	pxmitpriv->txirp_cnt = 1;		pxmitpriv->txirp_cnt = 1;

	/* per AC pending irp */
	pxmitpriv->voq_cnt = 0;

	pxmitpriv->ack_tx = false;		pxmitpriv->ack_tx = false;
	mutex_init(&pxmitpriv->ack_tx_mutex);		mutex_init(&pxmitpriv->ack_tx_mutex);
	rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);		rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);

drivers/staging/r8188eu/include/rtw_xmit.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -282,8 +282,6 @@ struct xmit_priv {
	* 1->vi, 2->be, 3->bk. */		* 1->vi, 2->be, 3->bk. */
	u8 txirp_cnt;/* */		u8 txirp_cnt;/* */
	struct tasklet_struct xmit_tasklet;		struct tasklet_struct xmit_tasklet;
	/* per AC pending irp */
	int voq_cnt;
	struct __queue free_xmitbuf_queue;		struct __queue free_xmitbuf_queue;
	struct __queue pending_xmitbuf_queue;		struct __queue pending_xmitbuf_queue;
	u8 *pallocated_xmitbuf;		u8 *pallocated_xmitbuf;

drivers/staging/r8188eu/os_dep/usb_ops_linux.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -42,9 +42,6 @@ static void usb_write_port_complete(struct urb purb, struct pt_regs regs)
	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;		struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	switch (pxmitbuf->flags) {		switch (pxmitbuf->flags) {
	case VO_QUEUE_INX:
	pxmitpriv->voq_cnt--;
	break;
	case HIGH_QUEUE_INX:		case HIGH_QUEUE_INX:
	rtw_chk_hi_queue_cmd(padapter);		rtw_chk_hi_queue_cmd(padapter);
	break;		break;
	@@ -106,7 +103,6 @@ u32 rtw_write_port(struct adapter padapter, u32 addr, u32 cnt, u8 wmem)

	switch (addr) {		switch (addr) {
	case VO_QUEUE_INX:		case VO_QUEUE_INX:
	pxmitpriv->voq_cnt++;
	pxmitbuf->flags = VO_QUEUE_INX;		pxmitbuf->flags = VO_QUEUE_INX;
	break;		break;
	case VI_QUEUE_INX:		case VI_QUEUE_INX: