diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-16 10:04:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-16 11:34:33 -0700 |
| commit | c174eae6f71bf3da736460e7872cdfc23c854fbc (patch) | |
| tree | 982042f74450c9ce1416fdabb5ce6d149247aba2 /drivers | |
| parent | 43aeefd925e246a70dd4be8e03a76701ded4918f (diff) | |
| download | linux-c174eae6f71bf3da736460e7872cdfc23c854fbc.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723au/include/usb_ops.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/os_dep/usb_intf.c | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h index 2836631dee83..58878dc36e76 100644 --- 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 b3965920b87c..556b97659f7d 100644 --- 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; |