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

Commit 2e628184 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: bolero: Fix compile errors on rx/tx macro"

parents 340b1f92 b7f823c4

asoc/codecs/bolero/rx-macro.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -883,7 +883,8 @@ static int rx_macro_set_idle_detect_thr(struct snd_soc_codec *codec, 
					int interp, int path_type)

					int interp, int path_type)

{

{

	int port_id[4] = { 0, 0, 0, 0 };

	int port_id[4] = { 0, 0, 0, 0 };

	int *port_ptr = NULL, num_ports = NULL;

	int *port_ptr = NULL;

	int num_ports = 0;

	int bit_width = 0, i = 0;

	int bit_width = 0, i = 0;

	int mux_reg = 0, mux_reg_val = 0;

	int mux_reg = 0, mux_reg_val = 0;

	int dai_id = 0, idle_thr = 0;

	int dai_id = 0, idle_thr = 0;

asoc/codecs/bolero/tx-macro.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -182,8 +182,8 @@ static int tx_macro_mclk_enable(struct tx_macro_priv *tx_priv, 
	struct regmap *regmap = dev_get_regmap(tx_priv->dev->parent, NULL);

	struct regmap *regmap = dev_get_regmap(tx_priv->dev->parent, NULL);

	int ret = 0;

	int ret = 0;





	dev_dbg(tx_priv->dev, "%s: mclk_enable = %u, dapm = %d clk_users= %d\n",

	dev_dbg(tx_priv->dev, "%s: mclk_enable = %u,clk_users= %d\n",

		__func__, mclk_enable, dapm, tx_priv->tx_mclk_users);

		__func__, mclk_enable, tx_priv->tx_mclk_users);





	mutex_lock(&tx_priv->mclk_lock);

	mutex_lock(&tx_priv->mclk_lock);

	if (mclk_enable) {

	if (mclk_enable) {
@@ -631,7 +631,7 @@ static int tx_macro_hw_params(struct snd_pcm_substream *substream, 
	int tx_fs_rate = -EINVAL;

	int tx_fs_rate = -EINVAL;

	struct snd_soc_codec *codec = dai->codec;

	struct snd_soc_codec *codec = dai->codec;

	u32 decimator = 0;

	u32 decimator = 0;

	u16 sample_rate = 0;

	u32 sample_rate = 0;

	u16 tx_fs_reg = 0;

	u16 tx_fs_reg = 0;

	struct device *tx_dev = NULL;

	struct device *tx_dev = NULL;

	struct tx_macro_priv *tx_priv = NULL;

	struct tx_macro_priv *tx_priv = NULL;