Commit 7f091d31 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: simplify wfx_scan_complete() 



wfx_scan_complete() do nothing with argument hif_ind_scan_cmpl. In add,
hif_ind_scan_cmpl come from hardware API and is not expected to be used
with upper layers of the driver.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-40-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd5d78bd

drivers/staging/wfx/hif_rx.c

+1 −2
Original line number Diff line number Diff line
@@ -203,10 +203,9 @@ static int hif_scan_complete_indication(struct wfx_dev *wdev, 
					const void *buf)

{

	struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface);

	const struct hif_ind_scan_cmpl *body = buf;



	WARN_ON(!wvif);

	wfx_scan_complete(wvif, body);

	wfx_scan_complete(wvif);



	return 0;

}

drivers/staging/wfx/scan.c

+1 −2
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	hif_stop_scan(wvif);

}



void wfx_scan_complete(struct wfx_vif *wvif,

		       const struct hif_ind_scan_cmpl *arg)

void wfx_scan_complete(struct wfx_vif *wvif)

{

	complete(&wvif->scan_complete);

}

drivers/staging/wfx/scan.h

+1 −4
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


#include <net/mac80211.h>



#include "hif_api_cmd.h"



struct wfx_dev;

struct wfx_vif;
@@ -19,7 +17,6 @@ void wfx_hw_scan_work(struct work_struct *work); 
int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		struct ieee80211_scan_request *req);

void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

void wfx_scan_complete(struct wfx_vif *wvif,

		       const struct hif_ind_scan_cmpl *ind);

void wfx_scan_complete(struct wfx_vif *wvif);



#endif /* WFX_SCAN_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE