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

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

staging: brcm80211: remove unused function from wlc_stf.c 



Working through a list of unused functions in the driver tree.
This file has following redundant function(s):

wlc_stf_stbc_rx_get
wlc_stf_rxchain_set

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e71e940c

drivers/staging/brcm80211/brcmsmac/wlc_stf.c

+0 −70
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \

	NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))



static s8 wlc_stf_stbc_rx_get(struct wlc_info *wlc);

static bool wlc_stf_stbc_tx_set(struct wlc_info *wlc, s32 int_val);

static int wlc_stf_txcore_set(struct wlc_info *wlc, u8 Nsts, u8 val);

static int wlc_stf_spatial_policy_set(struct wlc_info *wlc, int val);
@@ -151,12 +150,6 @@ wlc_stf_ss_algo_channel_get(struct wlc_info *wlc, u16 *ss_algo_channel, 
		setbit(ss_algo_channel, PHY_TXC1_MODE_STBC);

}



static s8 wlc_stf_stbc_rx_get(struct wlc_info *wlc)

{

	return (wlc->ht_cap.cap_info & HT_CAP_RX_STBC_MASK)

		>> HT_CAP_RX_STBC_SHIFT;

}



static bool wlc_stf_stbc_tx_set(struct wlc_info *wlc, s32 int_val)

{

	if ((int_val != AUTO) && (int_val != OFF) && (int_val != ON)) {
@@ -310,69 +303,6 @@ int wlc_stf_txchain_set(struct wlc_info *wlc, s32 int_val, bool force) 
	return BCME_OK;

}



int wlc_stf_rxchain_set(struct wlc_info *wlc, s32 int_val)

{

	u8 rxchain_cnt;

	u8 rxchain = (u8) int_val;

	u8 mimops_mode;

	u8 old_rxchain, old_rxchain_cnt;



	if (wlc->stf->rxchain == rxchain)

		return BCME_OK;



	if ((rxchain & ~wlc->stf->hw_rxchain)

	    || !(rxchain & wlc->stf->hw_rxchain))

		return BCME_RANGE;



	rxchain_cnt = (u8) WLC_BITSCNT(rxchain);

	if (WLC_STF_SS_STBC_RX(wlc)) {

		if ((rxchain_cnt == 1)

		    && (wlc_stf_stbc_rx_get(wlc) != HT_CAP_RX_STBC_NO))

			return BCME_RANGE;

	}



	if (APSTA_ENAB(wlc->pub) && (wlc->pub->associated))

		return BCME_ASSOCIATED;



	old_rxchain = wlc->stf->rxchain;

	old_rxchain_cnt = wlc->stf->rxstreams;



	wlc->stf->rxchain = rxchain;

	wlc->stf->rxstreams = rxchain_cnt;



	if (rxchain_cnt != old_rxchain_cnt) {

		mimops_mode =

		    (rxchain_cnt == 1) ? HT_CAP_MIMO_PS_ON : HT_CAP_MIMO_PS_OFF;

		wlc->mimops_PM = mimops_mode;

		if (AP_ENAB(wlc->pub)) {

			wlc_phy_stf_chain_set(wlc->band->pi, wlc->stf->txchain,

					      wlc->stf->rxchain);

			wlc_ht_mimops_cap_update(wlc, mimops_mode);

			if (wlc->pub->associated)

				wlc_mimops_action_ht_send(wlc, wlc->cfg,

							  mimops_mode);

			return BCME_OK;

		}

		if (wlc->pub->associated) {

			if (mimops_mode == HT_CAP_MIMO_PS_OFF) {

				/* if mimops is off, turn on the Rx chain first */

				wlc_phy_stf_chain_set(wlc->band->pi,

						      wlc->stf->txchain,

						      wlc->stf->rxchain);

				wlc_ht_mimops_cap_update(wlc, mimops_mode);

			}

		} else {

			wlc_phy_stf_chain_set(wlc->band->pi, wlc->stf->txchain,

					      wlc->stf->rxchain);

			wlc_ht_mimops_cap_update(wlc, mimops_mode);

		}

	} else if (old_rxchain != rxchain)

		wlc_phy_stf_chain_set(wlc->band->pi, wlc->stf->txchain,

				      wlc->stf->rxchain);



	return BCME_OK;

}



/* update wlc->stf->ss_opmode which represents the operational stf_ss mode we're using */

int wlc_stf_ss_update(struct wlc_info *wlc, struct wlcband *band)

{

drivers/staging/brcm80211/brcmsmac/wlc_stf.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ extern void wlc_stf_ss_algo_channel_get(struct wlc_info *wlc, 
extern int wlc_stf_ss_update(struct wlc_info *wlc, struct wlcband *band);

extern void wlc_stf_phy_txant_upd(struct wlc_info *wlc);

extern int wlc_stf_txchain_set(struct wlc_info *wlc, s32 int_val, bool force);

extern int wlc_stf_rxchain_set(struct wlc_info *wlc, s32 int_val);

extern bool wlc_stf_stbc_rx_set(struct wlc_info *wlc, s32 int_val);



extern int wlc_stf_ant_txant_validate(struct wlc_info *wlc, s8 val);