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

Commit 0fb77787 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Remove function rtw_alloc_etherdev() 



rtw_alloc_etherdev() is used in rtw_init_netdev() but never gets called
because old_padapter is never NULL.

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ed24e1f

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ struct rtw_netdev_priv_indicator { 
};

struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,

						    void *old_priv);

struct net_device *rtw_alloc_etherdev(int sizeof_priv);



#define rtw_netdev_priv(netdev)					\

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

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+1 −3
Original line number Diff line number Diff line
@@ -707,14 +707,12 @@ static const struct device_type wlan_type = { 
struct net_device *rtw_init_netdev(struct adapter *old_padapter)

{

	struct adapter *padapter;

	struct net_device *pnetdev;

	struct net_device *pnetdev = NULL;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n"));



	if (old_padapter != NULL)

		pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);

	else

		pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));



	if (!pnetdev)

		return NULL;

drivers/staging/rtl8188eu/os_dep/osdep_service.c

+0 −23
Original line number Diff line number Diff line
@@ -111,29 +111,6 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, 
	return pnetdev;

}



struct net_device *rtw_alloc_etherdev(int sizeof_priv)

{

	struct net_device *pnetdev;

	struct rtw_netdev_priv_indicator *pnpi;



	pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4);

	if (!pnetdev)

		goto RETURN;



	pnpi = netdev_priv(pnetdev);



	pnpi->priv = vzalloc(sizeof_priv);

	if (!pnpi->priv) {

		free_netdev(pnetdev);

		pnetdev = NULL;

		goto RETURN;

	}



	pnpi->sizeof_priv = sizeof_priv;

RETURN:

	return pnetdev;

}



void rtw_free_netdev(struct net_device *netdev)

{

	struct rtw_netdev_priv_indicator *pnpi;