redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8723au: Make event callbacks take a const u8 *

Browse source 
This avoids an ugly cast in mlme_evt_hdl23a()

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-09 15:03:19 +02:00 committed by Greg Kroah-Hartman
parent 0f6df02ad8
commit e2601960e9
5 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/rtl8723au/core/rtw_mlme.c
View file

@ -626,14 +626,14 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter,
} }
/* TODO: Perry : For Power Management */ /* TODO: Perry : For Power Management */
void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf) void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("receive atimdone_evet\n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("receive atimdone_evet\n"));
return; return;
} }
void rtw_survey_event_cb23a(struct rtw_adapter *adapter, u8 *pbuf) void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
u32 len; u32 len;
struct wlan_bssid_ex *pnetwork; struct wlan_bssid_ex *pnetwork;
@ -693,7 +693,8 @@ exit:
return; return;
} }
void rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf) void
rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
@ -814,11 +815,11 @@ void rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf)
rtw_cfg80211_surveydone_event_callback(adapter); rtw_cfg80211_surveydone_event_callback(adapter);
} }
void rtw_dummy_event_callback23a(struct rtw_adapter *adapter , u8 *pbuf) void rtw_dummy_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
} }
void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter , u8 *pbuf) void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
} }
@ -1335,7 +1336,7 @@ ignore_joinbss_callback:
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, u8 *pbuf) void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
@ -1344,7 +1345,7 @@ void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, u8 *pbuf)
rtw_os_xmit_schedule23a(adapter); rtw_os_xmit_schedule23a(adapter);
} }
void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf) void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
struct sta_info *psta; struct sta_info *psta;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1422,7 +1423,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf)
mlmeext_sta_add_event_callback23a(adapter, psta); mlmeext_sta_add_event_callback23a(adapter, psta);
} }
void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf) void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
{ {
int mac_id; int mac_id;
struct sta_info *psta; struct sta_info *psta;
@ -1531,7 +1532,7 @@ void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf)
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
void rtw_cpwm_event_callback23a(struct rtw_adapter *padapter, u8 *pbuf) void rtw_cpwm_event_callback23a(struct rtw_adapter *padapter, const u8 *pbuf)
{ {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
("+rtw_cpwm_event_callback23a !!!\n")); ("+rtw_cpwm_event_callback23a !!!\n"));

4
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View file

@ -6417,7 +6417,7 @@ u8 mlme_evt_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
u8 evt_code, evt_seq; u8 evt_code, evt_seq;
u16 evt_sz; u16 evt_sz;
const struct C2HEvent_Header *c2h; const struct C2HEvent_Header *c2h;
void (*event_callback)(struct rtw_adapter *dev, u8 *pbuf); void (*event_callback)(struct rtw_adapter *dev, const u8 *pbuf);
c2h = (struct C2HEvent_Header *)pbuf; c2h = (struct C2HEvent_Header *)pbuf;
evt_sz = c2h->len; evt_sz = c2h->len;
@ -6439,7 +6439,7 @@ u8 mlme_evt_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
} }
event_callback = wlanevents[evt_code].event_callback; event_callback = wlanevents[evt_code].event_callback;
event_callback(padapter, (u8 *)pbuf + sizeof(struct C2HEvent_Header)); event_callback(padapter, pbuf + sizeof(struct C2HEvent_Header));
_abort_event_: _abort_event_:

2
drivers/staging/rtl8723au/include/rtw_event.h
View file

@ -81,7 +81,7 @@ struct addba_event
struct fwevent { struct fwevent {
u32 parmsize; u32 parmsize;
void (*event_callback)(struct rtw_adapter *dev, u8 *pbuf); void (*event_callback)(struct rtw_adapter *dev, const u8 *pbuf);
}; };

14
drivers/staging/rtl8723au/include/rtw_mlme.h
View file

@ -333,13 +333,13 @@ void hostapd_mode_unload(struct rtw_adapter *padapter);
#endif #endif
void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf);
void rtw_survey_event_cb23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, u8 *pbuf); void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw_cpwm_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf); void rtw_cpwm_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
int event_thread(void *context); int event_thread(void *context);

4
drivers/staging/rtl8723au/include/rtw_mlme_ext.h
View file

@ -699,8 +699,8 @@ struct C2HEvent_Header {
unsigned int rsvd; unsigned int rsvd;
}; };
void rtw_dummy_event_callback23a(struct rtw_adapter *adapter , u8 *pbuf); void rtw_dummy_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf);
void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter , u8 *pbuf); void rtw23a_fwdbg_event_callback(struct rtw_adapter *adapter, const u8 *pbuf);
enum rtw_c2h_event { enum rtw_c2h_event {
GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/