Commit 1665c8fd authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: use netdev routines for private data 



This driver implements its own routines to allocate, access and free the
private data of its net_device. Use the functionality from the networking
core instead.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210321162009.15447-1-martin@kaiser.cx


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

drivers/staging/rtl8188eu/core/rtw_debug.c

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer, 
		       unsigned long count, void *data)

{

	struct net_device *dev = data;

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct adapter *padapter = netdev_priv(dev);

	char tmp[32];

	u32 addr, val, len;
@@ -75,7 +75,7 @@ int proc_get_read_reg(char *page, char **start, 
		      int *eof, void *data)

{

	struct net_device *dev = data;

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct adapter *padapter = netdev_priv(dev);



	int len = 0;
@@ -139,7 +139,7 @@ int proc_get_adapter_state(char *page, char **start, 
			   int *eof, void *data)

{

	struct net_device *dev = data;

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct adapter *padapter = netdev_priv(dev);

	int len = 0;



	len += scnprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
@@ -155,7 +155,7 @@ int proc_get_best_channel(char *page, char **start, 
			  int *eof, void *data)

{

	struct net_device *dev = data;

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct adapter *padapter = netdev_priv(dev);

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	int len = 0;

	u32 i, best_channel_24G = 1, index_24G = 0;

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int rtw_hw_resume(struct adapter *padapter) 
	pwrpriv->bips_processing = true;

	rtw_reset_drv_sw(padapter);



	if (ips_netdrv_open(rtw_netdev_priv(pnetdev)) != _SUCCESS) {

	if (ips_netdrv_open(netdev_priv(pnetdev)) != _SUCCESS) {

		mutex_unlock(&pwrpriv->mutex_lock);

		goto error_exit;

	}

drivers/staging/rtl8188eu/core/rtw_xmit.c

+4 −1
Original line number Diff line number Diff line
@@ -44,7 +44,10 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;

	u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;



	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */

	/*

	 * We don't need to memset padapter->XXX to zero because adapter is

	 * allocated by alloc_etherdev_mq, which eventually calls kvzalloc.

	 */



	spin_lock_init(&pxmitpriv->lock);

drivers/staging/rtl8188eu/include/osdep_intf.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void rtw_cancel_all_timer(struct adapter *padapter); 


int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);



struct net_device *rtw_init_netdev(struct adapter *padapter);

struct net_device *rtw_init_netdev(void);

u16 rtw_recv_select_queue(struct sk_buff *skb);



int netdev_open(struct net_device *pnetdev);

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −13
Original line number Diff line number Diff line
@@ -66,19 +66,6 @@ u8 *_rtw_malloc(u32 sz); 


void _rtw_init_queue(struct __queue *pqueue);



struct rtw_netdev_priv_indicator {

	void *priv;

};



struct net_device *rtw_alloc_etherdev_with_old_priv(void *old_priv);



static inline struct adapter *rtw_netdev_priv(struct net_device *netdev)

{

	return ((struct rtw_netdev_priv_indicator *)netdev_priv(netdev))->priv;

}



void rtw_free_netdev(struct net_device *netdev);



#define FUNC_NDEV_FMT "%s(%s)"

#define FUNC_NDEV_ARG(ndev) __func__, ndev->name

#define FUNC_ADPT_FMT "%s(%s)"