staging: brcm80211: remove unused function from bcmwifi.c

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

wf_chspec_ctlchspec

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/bcmwifi.h b/drivers/staging/brcm80211/include/bcmwifi.h
index 4978df8660bb102bf56d45655e81777c87f29a5b..4a0f976afaa489cc842a5a4e3c5a1545595a41e1 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmwifi.h
+++ b/drivers/staging/brcm80211/include/bcmwifi.h
@@ -143,13 +143,6 @@ extern bool wf_chspec_malformed(chanspec_t chanspec);
  */
 extern u8 wf_chspec_ctlchan(chanspec_t chspec);
 
-/*
- * This function returns the chanspec that control traffic is being sent on, for legacy
- * channels this is just the chanspec, for 40MHZ channels it is the upper or lowre 20MHZ
- * sideband depending on the chanspec selected
- */
-extern chanspec_t wf_chspec_ctlchspec(chanspec_t chspec);
-
 /*
  * Return the channel number for a given frequency and base frequency.
  * The returned channel number is relative to the given base frequency.

diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c
index b22d14b9aef4f268d466f46423429b333f0c32a6..3d3e5eaddefe402928c05d81e39cf5ec77c3fd89 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/drivers/staging/brcm80211/util/bcmwifi.c
@@ -79,29 +79,6 @@ u8 wf_chspec_ctlchan(chanspec_t chspec)
        return ctl_chan;
 }
 
-chanspec_t wf_chspec_ctlchspec(chanspec_t chspec)
-{
-       chanspec_t ctl_chspec = 0;
-       u8 channel;
-
-       ASSERT(!wf_chspec_malformed(chspec));
-
-       /* Is there a sideband ? */
-       if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_NONE) {
-               return chspec;
-       } else {
-               if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_UPPER) {
-                       channel = UPPER_20_SB(CHSPEC_CHANNEL(chspec));
-               } else {
-                       channel = LOWER_20_SB(CHSPEC_CHANNEL(chspec));
-               }
-               ctl_chspec =
-                   channel | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE;
-               ctl_chspec |= CHSPEC_BAND(chspec);
-       }
-       return ctl_chspec;
-}
-
 /*
  * Return the channel number for a given frequency and base frequency.
  * The returned channel number is relative to the given base frequency.