staging: rtl8723au: Fold rtl8723au_set_queue_pipe_mapping into rtl8723au_chip_configure() (4a293154) · Commits · 戴 / test

drivers/staging/rtl8723au/hal/usb_halinit.c

+8 −19

Original line number	Diff line number	Diff line
		@@ -60,33 +60,22 @@ _ConfigChipOutEP(struct rtw_adapter *pAdapter, u8 NumOutPipe)
		(u32)NumOutPipe, (u32)pHalData->OutEpNumber)); */
		}

		static bool rtl8723au_set_queue_pipe_mapping(struct rtw_adapter *pAdapter,
		u8 NumInPipe, u8 NumOutPipe)
		bool rtl8723au_chip_configure(struct rtw_adapter *padapter)
		{
		struct hal_data_8723a *pHalData = GET_HAL_DATA(pAdapter);
		bool result = false;
		struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
		struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
		u8 NumInPipe = pdvobjpriv->RtNumInPipes;
		u8 NumOutPipe = pdvobjpriv->RtNumOutPipes;

		_ConfigChipOutEP(pAdapter, NumOutPipe);
		_ConfigChipOutEP(padapter, NumOutPipe);

		/* Normal chip with one IN and one OUT doesn't have interrupt IN EP. */
		if (pHalData->OutEpNumber == 1) {
		if (NumInPipe != 1)
		return result;
		}

		result = Hal_MappingOutPipe23a(pAdapter, NumOutPipe);

		return result;
		return false;
		}

		void rtl8723au_chip_configure(struct rtw_adapter *padapter)
		{
		struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
		struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);

		rtl8723au_set_queue_pipe_mapping(padapter,
		pdvobjpriv->RtNumInPipes,
		pdvobjpriv->RtNumOutPipes);
		return Hal_MappingOutPipe23a(padapter, NumOutPipe);
		}

		static int _InitPowerOn(struct rtw_adapter *padapter)

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,6 @@ static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
		atomic_set(&dvobj->continual_urb_error, 0);
		}

		void rtl8723au_chip_configure(struct rtw_adapter *padapter);
		bool rtl8723au_chip_configure(struct rtw_adapter *padapter);

		#endif /* __USB_OPS_H_ */

+2 −1

Original line number	Diff line number	Diff line
		@@ -530,7 +530,8 @@ static struct rtw_adapter rtw_usb_if1_init(struct dvobj_priv dvobj,
		rtl8723a_read_chip_version(padapter);

		/* step usb endpoint mapping */
		rtl8723au_chip_configure(padapter);
		if (!rtl8723au_chip_configure(padapter))
		goto free_hal_data;

		/* step read efuse/eeprom data and get mac_addr */
		rtl8723a_read_adapter_info(padapter);