Commit 45607143 authored by Allen Pais's avatar Allen Pais Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: convert tasklets to use new tasklet_setup() API



In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Link: https://lore.kernel.org/r/20200916062224.58203-1-allen.lkml@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4effb03d
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ int rtw_hal_init_recv_priv(struct adapter *padapter)
	int i, res = _SUCCESS;
	struct recv_buf *precvbuf;

	tasklet_init(&precvpriv->recv_tasklet, rtl8188eu_recv_tasklet,
		     (unsigned long)padapter);
	tasklet_setup(&precvpriv->recv_tasklet, rtl8188eu_recv_tasklet);

	/* init recv_buf */
	_rtw_init_queue(&precvpriv->free_recv_buf_queue);
+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ s32 rtw_hal_init_xmit_priv(struct adapter *adapt)
{
	struct xmit_priv *pxmitpriv = &adapt->xmitpriv;

	tasklet_init(&pxmitpriv->xmit_tasklet, rtl8188eu_xmit_tasklet,
		     (unsigned long)adapt);
	tasklet_setup(&pxmitpriv->xmit_tasklet, rtl8188eu_xmit_tasklet);
	return _SUCCESS;
}

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ enum rx_packet_type {
};

#define INTERRUPT_MSG_FORMAT_LEN 60
void rtl8188eu_recv_tasklet(unsigned long priv);
void rtl8188eu_recv_tasklet(struct tasklet_struct *t);
void rtl8188e_process_phy_info(struct adapter *padapter,
			       struct recv_frame *prframe);
void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat *phy);
+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc,
s32 rtl8188eu_init_xmit_priv(struct adapter *padapter);
s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);
#define hal_xmit_handler rtl8188eu_xmit_buf_handler
void rtl8188eu_xmit_tasklet(unsigned long priv);
void rtl8188eu_xmit_tasklet(struct tasklet_struct *t);
bool rtl8188eu_xmitframe_complete(struct adapter *padapter,
				  struct xmit_priv *pxmitpriv);

+4 −4
Original line number Diff line number Diff line
@@ -773,10 +773,10 @@ void usb_write_port_cancel(struct adapter *padapter)
	}
}

void rtl8188eu_recv_tasklet(unsigned long priv)
void rtl8188eu_recv_tasklet(struct tasklet_struct *t)
{
	struct sk_buff *pskb;
	struct adapter *adapt = (struct adapter *)priv;
	struct adapter *adapt = from_tasklet(adapt, t, recvpriv.recv_tasklet);
	struct recv_priv *precvpriv = &adapt->recvpriv;

	while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) {
@@ -792,9 +792,9 @@ void rtl8188eu_recv_tasklet(unsigned long priv)
	}
}

void rtl8188eu_xmit_tasklet(unsigned long priv)
void rtl8188eu_xmit_tasklet(struct tasklet_struct *t)
{
	struct adapter *adapt = (struct adapter *)priv;
	struct adapter *adapt = from_tasklet(adapt, t, xmitpriv.xmit_tasklet);
	struct xmit_priv *pxmitpriv = &adapt->xmitpriv;

	if (check_fwstate(&adapt->mlmepriv, _FW_UNDER_SURVEY))