mwifiex: merge functions to derive cfp by chan & freq in one

There exist different functions with very long names
to derive the channel frequency and power tripplet
based on band and channel/freq.

Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 0ae1209646c1..a3d79f4a6192 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -529,11 +529,10 @@ int mwifiex_bss_set_channel(struct mwifiex_private *priv,
                 adapter->adhoc_start_band = BAND_G | BAND_B;
         if (chan->channel) {
                 if (chan->channel <= MAX_CHANNEL_BAND_BG)
-                        cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211
-                                        (priv, 0, (u16) chan->channel);
+                        cfp = mwifiex_get_cfp(priv, 0, (u16) chan->channel, 0);
                 if (!cfp) {
-                        cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211
-                                        (priv, BAND_A, (u16) chan->channel);
+                        cfp = mwifiex_get_cfp(priv, BAND_A,
+                                              (u16) chan->channel, 0);
                         if (cfp) {
                                 if (adapter->adhoc_11n_enabled)
                                         adapter->adhoc_start_band = BAND_A
@@ -544,11 +543,9 @@ int mwifiex_bss_set_channel(struct mwifiex_private *priv,
                 }
         } else {
                 if (chan->freq <= MAX_FREQUENCY_BAND_BG)
-                        cfp = mwifiex_get_cfp_by_band_and_freq_from_cfg80211(
-                                                        priv, 0, chan->freq);
+                        cfp = mwifiex_get_cfp(priv, 0, 0, chan->freq);
                 if (!cfp) {
-                        cfp = mwifiex_get_cfp_by_band_and_freq_from_cfg80211
-                                                  (priv, BAND_A, chan->freq);
+                        cfp = mwifiex_get_cfp(priv, BAND_A, 0, chan->freq);
                         if (cfp) {
                                 if (adapter->adhoc_11n_enabled)
                                         adapter->adhoc_start_band = BAND_A