Commit 68d9bfb6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: stream: uniquify dev_err() logs 



There are a couple of duplicate logs which makes harder than needed to
follow the error flows. Add __func__ or make the log unique.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230322035524.1509029-3-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent d014688e

drivers/soundwire/stream.c

+10 −8
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, 


	ret = do_bank_switch(stream);

	if (ret < 0) {

		pr_err("Bank switch failed: %d\n", ret);

		pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);

		goto restore_params;

	}
@@ -1477,7 +1477,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) 
		/* Program params */

		ret = sdw_program_params(bus, false);

		if (ret < 0) {

			dev_err(bus->dev, "Program params failed: %d\n", ret);

			dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);

			return ret;

		}
@@ -1497,7 +1497,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) 


	ret = do_bank_switch(stream);

	if (ret < 0) {

		pr_err("Bank switch failed: %d\n", ret);

		pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);

		return ret;

	}
@@ -1567,14 +1567,14 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream) 
		/* Program params */

		ret = sdw_program_params(bus, false);

		if (ret < 0) {

			dev_err(bus->dev, "Program params failed: %d\n", ret);

			dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);

			return ret;

		}

	}



	ret = do_bank_switch(stream);

	if (ret < 0) {

		pr_err("Bank switch failed: %d\n", ret);

		pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);

		return ret;

	}
@@ -1664,7 +1664,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) 
		/* Program params */

		ret = sdw_program_params(bus, false);

		if (ret < 0) {

			dev_err(bus->dev, "Program params failed: %d\n", ret);

			dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);

			return ret;

		}

	}
@@ -1893,7 +1893,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, 


	m_rt = sdw_master_rt_alloc(bus, stream);

	if (!m_rt) {

		dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name);

		dev_err(bus->dev, "%s: Master runtime alloc failed for stream:%s\n",

			__func__, stream->name);

		ret = -ENOMEM;

		goto unlock;

	}
@@ -2012,7 +2013,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave, 
	 */

	m_rt = sdw_master_rt_alloc(slave->bus, stream);

	if (!m_rt) {

		dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name);

		dev_err(&slave->dev, "%s: Master runtime alloc failed for stream:%s\n",

			__func__, stream->name);

		ret = -ENOMEM;

		goto unlock;

	}