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

staging: rtl8723au: Move dummy_event_callback() to rtw_mlme_ext.c 



In addition get rid of a couple of empty *_event_callback() handlers
and use dummy_event_callback() instead.

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

drivers/staging/rtl8723au/core/rtw_mlme.c

+0 −14
Original line number Diff line number Diff line
@@ -818,14 +818,6 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	rtw_cfg80211_surveydone_event_callback(adapter);

}



void rtw_dummy_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)

{

}



void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter, const u8 *pbuf)

{

}



static void free_scanqueue(struct mlme_priv *pmlmepriv)

{

	struct wlan_network *pnetwork;
@@ -1540,12 +1532,6 @@ void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	spin_unlock_bh(&pmlmepriv->lock);

}



void rtw_cpwm_event_callback23a(struct rtw_adapter *padapter, const u8 *pbuf)

{

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("+rtw_cpwm_event_callback23a !!!\n"));

}



/*

* rtw23a_join_to_handler - Timeout/faliure handler for CMD JoinBss

* @adapter: pointer to _adapter structure

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+9 −5
Original line number Diff line number Diff line
@@ -235,9 +235,13 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { 


static struct rt_channel_plan_map	RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02}; /* use the conbination for max channel numbers */



static void dummy_event_callback(struct rtw_adapter *adapter, const u8 *pbuf)

{

}



static struct fwevent wlanevents[] =

{

	{0, rtw_dummy_event_callback23a},	/*0*/

	{0, &dummy_event_callback},	/*0*/

	{0, NULL},

	{0, NULL},

	{0, NULL},
@@ -251,17 +255,17 @@ static struct fwevent wlanevents[] = 
	{0, &rtw23a_joinbss_event_cb},		/*10*/

	{sizeof(struct stassoc_event), &rtw_stassoc_event_callback23a},

	{sizeof(struct stadel_event), &rtw_stadel_event_callback23a},

	{0, &rtw_atimdone_event_callback23a},

	{0, rtw_dummy_event_callback23a},

	{0, &dummy_event_callback},

	{0, &dummy_event_callback},

	{0, NULL},	/*15*/

	{0, NULL},

	{0, NULL},

	{0, NULL},

	{0, rtw23a_fwdbg_event_callback},

	{0, &dummy_event_callback},

	{0, NULL},	 /*20*/

	{0, NULL},

	{0, NULL},

	{0, &rtw_cpwm_event_callback23a},

	{0, &dummy_event_callback},

	{0, NULL},

};

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −3
Original line number Diff line number Diff line
@@ -338,9 +338,6 @@ void rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbu 
void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, const u8 *pbuf);

void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);

void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);

void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);

void rtw_cpwm_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);





int event_thread(void *context);

void rtw23a_join_to_handler(unsigned long);

drivers/staging/rtl8723au/include/rtw_mlme_ext.h

+0 −3
Original line number Diff line number Diff line
@@ -670,9 +670,6 @@ struct C2HEvent_Header { 
	unsigned int rsvd;

};



void rtw_dummy_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);

void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter, const u8 *pbuf);



enum rtw_c2h_event {

	GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/

	GEN_EVT_CODE(_Read_BBREG),

CRA Git | Maintained and supported by SUSTech CRA and CCSE