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

staging: rtl8723au: Call rtl8723au_set_hw_type() directly 



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

drivers/staging/rtl8723au/include/usb_ops.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ enum { 
		     (timeout_ms))



void rtl8723au_set_hw_type(struct rtw_adapter *padapter);

#define hal_set_hw_type rtl8723au_set_hw_type



void rtl8723au_set_intf_ops(struct rtw_adapter *padapter);

drivers/staging/rtl8723au/os_dep/usb_intf.c

+1 −9
Original line number Diff line number Diff line
@@ -275,13 +275,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) 
	usb_put_dev(interface_to_usbdev(usb_intf));

}



static void decide_chip_type_by_usb_device_id(struct rtw_adapter *padapter,

					      const struct usb_device_id *pdid)

{

	padapter->chip_type = NULL_CHIP_TYPE;

	hal_set_hw_type(padapter);

}



static void usb_intf_start(struct rtw_adapter *padapter)

{

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
@@ -601,8 +594,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	dvobj->padapters[dvobj->iface_nums++] = padapter;

	padapter->iface_id = IFACE_ID0;



	/* step 1-1., decide the chip_type via vid/pid */

	decide_chip_type_by_usb_device_id(padapter, pdid);

	rtl8723au_set_hw_type(padapter);



	if (rtw_handle_dualmac23a(padapter, 1) != _SUCCESS)

		goto free_adapter;