Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b616d81 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove duplicated code from brcmf_init_iscan 



Part of the code in brcmf_init_scan was identical to the code in
brcmf_invoke_iscan and has been replaced by a call to it.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 26f12830

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+4 −11
Original line number Diff line number Diff line
@@ -3343,7 +3343,6 @@ static void brcmf_iscan_timer(unsigned long data) 
static s32 brcmf_invoke_iscan(struct brcmf_cfg80211_priv *cfg_priv)

{

	struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv);

	int err = 0;



	if (cfg_priv->iscan_on && !iscan->tsk) {

		iscan->state = WL_ISCAN_STATE_IDLE;
@@ -3356,7 +3355,7 @@ static s32 brcmf_invoke_iscan(struct brcmf_cfg80211_priv *cfg_priv) 
		}

	}



	return err;

	return 0;

}



static void brcmf_init_iscan_eloop(struct brcmf_cfg80211_iscan_eloop *el)
@@ -3376,19 +3375,13 @@ static s32 brcmf_init_iscan(struct brcmf_cfg80211_priv *cfg_priv) 


	if (cfg_priv->iscan_on) {

		iscan->dev = cfg_to_ndev(cfg_priv);

		iscan->state = WL_ISCAN_STATE_IDLE;

		brcmf_init_iscan_eloop(&iscan->el);

		iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS;

		init_timer(&iscan->timer);

		iscan->timer.data = (unsigned long) iscan;

		iscan->timer.function = brcmf_iscan_timer;

		sema_init(&iscan->sync, 0);

		iscan->tsk = kthread_run(brcmf_iscan_thread, iscan, "wl_iscan");

		if (IS_ERR(iscan->tsk)) {

			WL_ERR("Could not create iscan thread\n");

			iscan->tsk = NULL;

			return -ENOMEM;

		}

		err = brcmf_invoke_iscan(cfg_priv);

		if (!err)

			iscan->data = cfg_priv;

	}