From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
Since wfx_scan_complete() is now only called from
wfx_scan_complete_cb(), it make sense to merge the both functions.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
---
drivers/staging/wfx/scan.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c
index 397fe511d34a..c043f2f79541 100644
--- a/drivers/staging/wfx/scan.c
+++ b/drivers/staging/wfx/scan.c
@@ -228,12 +228,6 @@ void wfx_scan_work(struct work_struct *work)
schedule_work(&wvif->scan.work);
}
-static void wfx_scan_complete(struct wfx_vif *wvif)
-{
- up(&wvif->scan.lock);
- wfx_scan_work(&wvif->scan.work);
-}
-
void wfx_scan_complete_cb(struct wfx_vif *wvif,
const struct hif_ind_scan_cmpl *arg)
{
@@ -257,6 +251,7 @@ void wfx_scan_timeout(struct work_struct *work)
wvif->scan.curr = wvif->scan.end;
hif_stop_scan(wvif);
}
- wfx_scan_complete(wvif);
+ up(&wvif->scan.lock);
+ wfx_scan_work(&wvif->scan.work);
}
}
--
2.20.1
