Commit 00d5865c authored by Marco Cesati's avatar Marco Cesati Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove typedefs in osdep_service_linux.h 



This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #43: FILE: include/osdep_service_linux.h:43:
    +	typedef	spinlock_t	_lock;

    WARNING: do not add new typedefs
    #44: FILE: include/osdep_service_linux.h:44:
    +	typedef struct mutex		_mutex;

    WARNING: do not add new typedefs
    #45: FILE: include/osdep_service_linux.h:45:
    +	typedef struct timer_list _timer;

    WARNING: do not add new typedefs
    #52: FILE: include/osdep_service_linux.h:52:
    +	typedef	struct sk_buff	_pkt;

    WARNING: do not add new typedefs
    #53: FILE: include/osdep_service_linux.h:53:
    +	typedef unsigned char _buffer;

    WARNING: do not add new typedefs
    #55: FILE: include/osdep_service_linux.h:55:
    +	typedef	int	_OS_STATUS;

    WARNING: do not add new typedefs
    #57: FILE: include/osdep_service_linux.h:57:
    +	typedef unsigned long _irqL;

    WARNING: do not add new typedefs
    #58: FILE: include/osdep_service_linux.h:58:
    +	typedef	struct	net_device * _nic_hdl;

    WARNING: do not add new typedefs
    #62: FILE: include/osdep_service_linux.h:62:
    +	typedef void timer_hdl_return;

    WARNING: do not add new typedefs
    #63: FILE: include/osdep_service_linux.h:63:
    +	typedef void* timer_hdl_context;

    WARNING: do not add new typedefs
    #65: FILE: include/osdep_service_linux.h:65:
    +	typedef struct work_struct _workitem;

Signed-off-by: default avatarMarco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-29-marco.cesati@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d495c550

drivers/staging/rtl8723bs/core/rtw_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) 
	return res;

}



static void c2h_wk_callback(_workitem * work);

static void c2h_wk_callback(struct work_struct * work);

int rtw_init_evt_priv(struct evt_priv *pevtpriv)

{

	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
@@ -260,7 +260,7 @@ ISR/Call-Back functions can't call this sub-function. 


int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)

{

	_irqL irqL;

	unsigned long irqL;



	if (obj == NULL)

		goto exit;
@@ -279,7 +279,7 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) 


struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue)

{

	_irqL irqL;

	unsigned long irqL;

	struct cmd_obj *obj;



	/* spin_lock_bh(&(queue->lock)); */
@@ -1875,7 +1875,7 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt) 
	return res;

}



static void c2h_wk_callback(_workitem *work)

static void c2h_wk_callback(struct work_struct *work)

{

	struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk);

	struct adapter *adapter = container_of(evtpriv, struct adapter, evtpriv);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -2340,7 +2340,7 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) 
s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)

{

	s32 ret = _FAIL;

	_irqL irqL;

	unsigned long irqL;

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;

	struct submit_ctx sctx;

drivers/staging/rtl8723bs/core/rtw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -1846,7 +1846,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) 
	u16 nSubframe_Length;

	u8 nr_subframes, i;

	u8 *pdata;

	_pkt *sub_pkt, *subframes[MAX_SUBFRAME_COUNT];

	struct sk_buff *sub_pkt, *subframes[MAX_SUBFRAME_COUNT];

	struct recv_priv *precvpriv = &padapter->recvpriv;

	struct __queue *pfree_recv_queue = &(precvpriv->free_recv_queue);

drivers/staging/rtl8723bs/core/rtw_xmit.c

+9 −9
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) 
	pattrib->subtype = WIFI_QOS_DATA_TYPE;

}



static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)

static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)

{

	struct pkt_file pktfile;

	struct sta_info *psta = NULL;
@@ -1085,7 +1085,7 @@ This sub-routine will perform all the following: 
6. apply sw-encrypt, if necessary.



*/

s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)

s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)

{

	struct pkt_file pktfile;
@@ -1216,7 +1216,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram 
}



/* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */

s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)

s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)

{

	u8 *pframe, *mem_start = NULL, *tmp_buf = NULL;

	u8 subtype;
@@ -1534,7 +1534,7 @@ struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv, 


struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)

{

	_irqL irqL;

	unsigned long irqL;

	struct xmit_buf *pxmitbuf =  NULL;

	struct list_head *plist, *phead;

	struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
@@ -1578,7 +1578,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) 


s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)

{

	_irqL irqL;

	unsigned long irqL;

	struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;



	if (!pxmitbuf)
@@ -1601,7 +1601,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) 


struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)

{

	_irqL irqL;

	unsigned long irqL;

	struct xmit_buf *pxmitbuf =  NULL;

	struct list_head *plist, *phead;

	struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
@@ -1650,7 +1650,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) 


s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)

{

	_irqL irqL;

	unsigned long irqL;

	struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;



	if (!pxmitbuf)
@@ -1804,7 +1804,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram 
{

	struct __queue *queue = NULL;

	struct adapter *padapter = pxmitpriv->adapter;

	_pkt *pndis_pkt = NULL;

	struct sk_buff *pndis_pkt = NULL;



	if (!pxmitframe) {

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("======rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n"));
@@ -2077,7 +2077,7 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib 
 *0	success, hardware will handle this xmit frame(packet)

 *<0	fail

 */

s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)

s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)

{

	static unsigned long start;

	static u32 drop_cnt;

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe, 
		.is_beacon   = false,

	};



	/* _irqL		irqL; */

	/* unsigned long		irqL; */

	struct sta_priv *pstapriv;

	struct sta_info *psta;
@@ -242,7 +242,7 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) 
	struct __queue *recv_buf_queue;

	u8 *ptr;

	u32 pkt_offset, skb_len, alloc_sz;

	_pkt *pkt_copy = NULL;

	struct sk_buff *pkt_copy = NULL;

	u8 shift_sz = 0, rx_report_sz = 0;



	p_hal_data = GET_HAL_DATA(padapter);