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, 4 insertions, 5 deletions

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index bce9991612c8..803275f58c78 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -777,12 +777,11 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
         adhoc_start->phy_param_set.ds_param_set.element_id = DS_PARA_IE_ID;
         adhoc_start->phy_param_set.ds_param_set.len = DS_PARA_IE_LEN;
 
-        if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211
-                        (priv, adapter->adhoc_start_band, (u16)
-                                priv->adhoc_channel)) {
+        if (!mwifiex_get_cfp(priv, adapter->adhoc_start_band,
+                             (u16) priv->adhoc_channel, 0)) {
                 struct mwifiex_chan_freq_power *cfp;
-                cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211(priv,
-                                adapter->adhoc_start_band, FIRST_VALID_CHANNEL);
+                cfp = mwifiex_get_cfp(priv, adapter->adhoc_start_band,
+                                      FIRST_VALID_CHANNEL, 0);
                 if (cfp)
                         priv->adhoc_channel = (u8) cfp->channel;
         }