mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 20:34:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Call rtl8723au_set_hw_type() directly

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-05-16 10:04:57 +02:00
committed by Greg Kroah-Hartman
parent 43aeefd925
commit c174eae6f7
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8723au/include/usb_ops.h
View File

@@ -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);

10
drivers/staging/rtl8723au/os_dep/usb_intf.c
View File

@@ -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;