ASoC: codecs: wcd938x: remove unused port-map reference

port_map field was added prior to adding static port map support in soundwire.
This makes port_map array in struct wcd938x_sdw_priv redundant and unused,
so remove this.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210716105612.5284-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index 5fd708e013f98bb7957ae53f8201a2f833b18b75..a627142426b254943b96a053a9fc05299b255307 100644 (file)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -1360,7 +1360,6 @@ static int wcd938x_io_init(struct wcd938x_priv *wcd938x)
 
 static int wcd938x_sdw_connect_port(struct wcd938x_sdw_ch_info *ch_info,
                                    struct sdw_port_config *port_config,
-                                   u32 mstr_port_num,
                                    u8 enable)
 {
        u8 ch_mask, port_num;
@@ -1380,14 +1379,12 @@ static int wcd938x_sdw_connect_port(struct wcd938x_sdw_ch_info *ch_info,
 
 static int wcd938x_connect_port(struct wcd938x_sdw_priv *wcd, u8 ch_id, u8 enable)
 {
-       u8 port_num, mstr_port_num;
+       u8 port_num;
 
        port_num = wcd->ch_info[ch_id].port_num;
-       mstr_port_num = wcd->port_map[port_num - 1];
 
        return wcd938x_sdw_connect_port(&wcd->ch_info[ch_id],
                                        &wcd->port_config[port_num],
-                                       mstr_port_num,
                                        enable);
 }
 

diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h
index 07b08de4cebf840ecd2eaaced2c1c6da8ee2de9c..ea82039e78435bd3d4417fa2afb1c11cc54c63a9 100644 (file)
--- a/sound/soc/codecs/wcd938x.h
+++ b/sound/soc/codecs/wcd938x.h
@@ -658,7 +658,6 @@ struct wcd938x_sdw_priv {
        struct sdw_port_config port_config[WCD938X_MAX_SWR_PORTS];
        struct wcd938x_sdw_ch_info *ch_info;
        bool port_enable[WCD938X_MAX_SWR_CH_IDS];
-       int port_map[WCD938X_MAX_SWR_PORTS];
        int active_ports;
        int num_ports;
        bool is_tx;