Skip to content

Commit 68d9bfb

Browse files
plbossartvinodkoul
authored andcommitted
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Bard 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: Vinod Koul <vkoul@kernel.org>
1 parent d014688 commit 68d9bfb

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

drivers/soundwire/stream.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
13891389

13901390
ret = do_bank_switch(stream);
13911391
if (ret < 0) {
1392-
pr_err("Bank switch failed: %d\n", ret);
1392+
pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);
13931393
goto restore_params;
13941394
}
13951395

@@ -1477,7 +1477,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)
14771477
/* Program params */
14781478
ret = sdw_program_params(bus, false);
14791479
if (ret < 0) {
1480-
dev_err(bus->dev, "Program params failed: %d\n", ret);
1480+
dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);
14811481
return ret;
14821482
}
14831483

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

14981498
ret = do_bank_switch(stream);
14991499
if (ret < 0) {
1500-
pr_err("Bank switch failed: %d\n", ret);
1500+
pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);
15011501
return ret;
15021502
}
15031503

@@ -1567,14 +1567,14 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream)
15671567
/* Program params */
15681568
ret = sdw_program_params(bus, false);
15691569
if (ret < 0) {
1570-
dev_err(bus->dev, "Program params failed: %d\n", ret);
1570+
dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);
15711571
return ret;
15721572
}
15731573
}
15741574

15751575
ret = do_bank_switch(stream);
15761576
if (ret < 0) {
1577-
pr_err("Bank switch failed: %d\n", ret);
1577+
pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);
15781578
return ret;
15791579
}
15801580

@@ -1664,7 +1664,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
16641664
/* Program params */
16651665
ret = sdw_program_params(bus, false);
16661666
if (ret < 0) {
1667-
dev_err(bus->dev, "Program params failed: %d\n", ret);
1667+
dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret);
16681668
return ret;
16691669
}
16701670
}
@@ -1893,7 +1893,8 @@ int sdw_stream_add_master(struct sdw_bus *bus,
18931893

18941894
m_rt = sdw_master_rt_alloc(bus, stream);
18951895
if (!m_rt) {
1896-
dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
1896+
dev_err(bus->dev, "%s: Master runtime alloc failed for stream:%s\n",
1897+
__func__, stream->name);
18971898
ret = -ENOMEM;
18981899
goto unlock;
18991900
}
@@ -2012,7 +2013,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
20122013
*/
20132014
m_rt = sdw_master_rt_alloc(slave->bus, stream);
20142015
if (!m_rt) {
2015-
dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
2016+
dev_err(&slave->dev, "%s: Master runtime alloc failed for stream:%s\n",
2017+
__func__, stream->name);
20162018
ret = -ENOMEM;
20172019
goto unlock;
20182020
}

0 commit comments

Comments
 (0)