Commit 596f85ad authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Call usb_intf_{start,stop} directly 



Rip out multiple layer of useless wrappers

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c174eae6

drivers/staging/rtl8723au/include/drv_types.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -251,9 +251,6 @@ struct rtw_adapter { 
	u8	init_adpt_in_progress;

	u8	init_adpt_in_progress;

	u8	bHaltInProgress;

	u8	bHaltInProgress;





	void (*intf_start)(struct rtw_adapter *adapter);

	void (*intf_stop)(struct rtw_adapter *adapter);



	struct net_device *pnetdev;

	struct net_device *pnetdev;





	/*  used by rtw_rereg_nd_name related function */

	/*  used by rtw_rereg_nd_name related function */

drivers/staging/rtl8723au/include/osdep_intf.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -41,4 +41,8 @@ void rtw_ips_pwr_down23a(struct rtw_adapter *padapter); 
int rtw_drv_register_netdev(struct rtw_adapter *padapter);

int rtw_drv_register_netdev(struct rtw_adapter *padapter);

void rtw_ndev_destructor(struct net_device *ndev);

void rtw_ndev_destructor(struct net_device *ndev);





int rtl8723au_inirp_init(struct rtw_adapter *Adapter);

int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter);

void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter);



#endif	/* _OSDEP_INTF_H_ */
 
#endif	/* _OSDEP_INTF_H_ */

drivers/staging/rtl8723au/include/usb_ops.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -91,8 +91,6 @@ static inline u8 rtw_usb_bulk_size_boundary(struct rtw_adapter *padapter, 
	return rst;

	return rst;

}

}





int rtl8723au_inirp_init(struct rtw_adapter *Adapter);

int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter);

void rtl8723au_chip_configure(struct rtw_adapter *padapter);

void rtl8723au_chip_configure(struct rtw_adapter *padapter);





#endif /* __USB_OPS_H_ */
 
#endif /* __USB_OPS_H_ */

drivers/staging/rtl8723au/os_dep/os_intfs.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -693,8 +693,7 @@ int netdev_open23a(struct net_device *pnetdev) 
			goto netdev_open23a_error;

			goto netdev_open23a_error;

		}

		}





		if (padapter->intf_start)

		rtl8723au_inirp_init(padapter);

			padapter->intf_start(padapter);





		rtw_cfg80211_init_wiphy(padapter);

		rtw_cfg80211_init_wiphy(padapter);
@@ -756,8 +755,7 @@ static int ips_netdrv_open(struct rtw_adapter *padapter) 
		goto netdev_open23a_error;

		goto netdev_open23a_error;

	}

	}





	if (padapter->intf_start)

	rtl8723au_inirp_init(padapter);

		padapter->intf_start(padapter);





	rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);

	rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);

	mod_timer(&padapter->mlmepriv.dynamic_chk_timer,

	mod_timer(&padapter->mlmepriv.dynamic_chk_timer,
@@ -811,8 +809,7 @@ void rtw_ips_dev_unload23a(struct rtw_adapter *padapter) 
{

{

	rtl8723a_fifo_cleanup(padapter);

	rtl8723a_fifo_cleanup(padapter);





	if (padapter->intf_stop)

	rtl8723a_usb_intf_stop(padapter);

		padapter->intf_stop(padapter);





	/* s5. */

	/* s5. */

	if (!padapter->bSurpriseRemoved)

	if (!padapter->bSurpriseRemoved)

drivers/staging/rtl8723au/os_dep/usb_intf.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -275,14 +275,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) 
	usb_put_dev(interface_to_usbdev(usb_intf));

	usb_put_dev(interface_to_usbdev(usb_intf));

}

}





static void usb_intf_start(struct rtw_adapter *padapter)

void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter)

{

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));

	rtl8723au_inirp_init(padapter);

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));

}



static void usb_intf_stop(struct rtw_adapter *padapter)

{

{

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
@@ -318,8 +311,7 @@ static void rtw_dev_unload(struct rtw_adapter *padapter) 
					RTW_SCTX_DONE_DRV_STOP);

					RTW_SCTX_DONE_DRV_STOP);





		/* s3. */

		/* s3. */

		if (padapter->intf_stop)

		rtl8723a_usb_intf_stop(padapter);

			padapter->intf_stop(padapter);





		/* s4. */

		/* s4. */

		if (!padapter->pwrctrlpriv.bInternalAutoSuspend)

		if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
@@ -609,9 +601,6 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	if (!padapter->HalData)

	if (!padapter->HalData)

		goto free_wdev;

		goto free_wdev;





	padapter->intf_start = &usb_intf_start;

	padapter->intf_stop = &usb_intf_stop;



	rtl8723au_set_intf_ops(padapter);

	rtl8723au_set_intf_ops(padapter);





	/* step read_chip_version */

	/* step read_chip_version */