staging: rtl8723au: Call rtl8723au_set_hw_type() directly

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h
index 2836631dee83c7c13beabdc8e4f9b4139ab67e0d..58878dc36e7689f4eab1e8f92b0cc2ed7833d6d6 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops.h
+++ b/drivers/staging/rtl8723au/include/usb_ops.h
@@ -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);
 

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index b3965920b87c563376d4e6f89de5d5f71357cc74..556b97659f7da2a39e0da066fedc71d3e522e855 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -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;