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

Commit 1332a0dd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: fix compilation issue"

parents b5348ffe d8bb93c4

asoc/codecs/bolero/bolero-cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ int bolero_register_macro(struct device *dev, u16 macro_id, 
	priv->num_macros_registered++;

	priv->macros_supported[macro_id] = true;



	dev_dbg(dev, "%s: register macro successful:%d\n", macro_id);

	dev_dbg(dev, "%s: register macro successful:%d\n", __func__, macro_id);



	if (priv->num_macros_registered == priv->num_macros) {

		ret = bolero_copy_dais_from_macro(priv);

asoc/codecs/bolero/bolero-clk-rsc.c

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int bolero_rsc_clk_reset(struct device *dev, int clk_id) 
	int count = 0;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return -EINVAL;

	}
@@ -147,7 +147,7 @@ void bolero_clk_rsc_enable_all_clocks(struct device *dev, bool enable) 
	int i = 0;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return;

	}
@@ -439,7 +439,7 @@ void bolero_clk_rsc_fs_gen_request(struct device *dev, bool enable) 
	struct bolero_clk_rsc *priv = NULL;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return;

	}

	clk_dev = bolero_get_rsc_clk_device_ptr(dev->parent);
@@ -514,7 +514,7 @@ int bolero_clk_rsc_request_clock(struct device *dev, 
	bool mux_switch = false;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return -EINVAL;

	}

	if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) &&

asoc/codecs/bolero/rx-macro.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -1120,7 +1120,7 @@ static int rx_macro_get_channel_map(struct snd_soc_dai *dai, 
		*rx_slot = ch_mask;

		*rx_num = rx_priv->active_ch_cnt[dai->id];

		dev_dbg(rx_priv->dev,

			"%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%x\n",

			"%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%lx\n",

			__func__, dai->id, *rx_slot, *rx_num, rx_priv->active_ch_mask[dai->id]);

		break;

	case RX_MACRO_AIF_ECHO:

asoc/codecs/wcd938x/wcd938x-slave.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -287,7 +287,7 @@ static int wcd938x_slave_bind(struct device *dev, 
	ret = swr_get_logical_dev_num(pdev, pdev->addr, &devnum);

	if (ret) {

		dev_dbg(&pdev->dev,

			"%s get devnum %d for dev addr %lx failed\n",

			"%s get devnum %d for dev addr %llx failed\n",

			__func__, devnum, pdev->addr);

		return ret;

	}

asoc/codecs/wcd938x/wcd938x.c

+1 −1
Original line number Diff line number Diff line
@@ -1960,7 +1960,7 @@ static int wcd938x_get_logical_addr(struct swr_device *swr_dev) 
		ret = swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum);

		if (ret) {

			dev_err(&swr_dev->dev,

				"%s get devnum %d for dev addr %lx failed\n",

				"%s get devnum %d for dev addr %llx failed\n",

				__func__, devnum, swr_dev->addr);

			/* retry after 1ms */

			usleep_range(1000, 1010);