Skip to content

Commit 7e08619

Browse files
committed
soundwire: bus: uniquify dev_err() for SCP_INT access
We have multiple cases where we read/write SCP_INT registers, but the same error message in all cases. Add a distinct error message for each case to help debug. Reported-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent daa64af commit 7e08619

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/soundwire/bus.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,15 +1274,15 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
12741274
status = sdw_read_no_pm(slave, SDW_SCP_INT1);
12751275
if (status < 0) {
12761276
dev_err(&slave->dev,
1277-
"SDW_SCP_INT1 read failed:%d\n", status);
1277+
"SDW_SCP_INT1 (BUS_CLASH) read failed:%d\n", status);
12781278
return status;
12791279
}
12801280
if (status & SDW_SCP_INT1_BUS_CLASH) {
12811281
dev_warn(&slave->dev, "Bus clash detected before INT mask is enabled\n");
12821282
ret = sdw_write_no_pm(slave, SDW_SCP_INT1, SDW_SCP_INT1_BUS_CLASH);
12831283
if (ret < 0) {
12841284
dev_err(&slave->dev,
1285-
"SDW_SCP_INT1 write failed:%d\n", ret);
1285+
"SDW_SCP_INT1 (BUS_CLASH) write failed:%d\n", ret);
12861286
return ret;
12871287
}
12881288
}
@@ -1293,15 +1293,15 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
12931293
status = sdw_read_no_pm(slave, SDW_SCP_INT1);
12941294
if (status < 0) {
12951295
dev_err(&slave->dev,
1296-
"SDW_SCP_INT1 read failed:%d\n", status);
1296+
"SDW_SCP_INT1 (PARITY) read failed:%d\n", status);
12971297
return status;
12981298
}
12991299
if (status & SDW_SCP_INT1_PARITY) {
13001300
dev_warn(&slave->dev, "PARITY error detected before INT mask is enabled\n");
13011301
ret = sdw_write_no_pm(slave, SDW_SCP_INT1, SDW_SCP_INT1_PARITY);
13021302
if (ret < 0) {
13031303
dev_err(&slave->dev,
1304-
"SDW_SCP_INT1 write failed:%d\n", ret);
1304+
"SDW_SCP_INT1 (PARITY) write failed:%d\n", ret);
13051305
return ret;
13061306
}
13071307

@@ -1637,23 +1637,23 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
16371637
ret = sdw_read_no_pm(slave, SDW_SCP_INT1);
16381638
if (ret < 0) {
16391639
dev_err(&slave->dev,
1640-
"SDW_SCP_INT1 read failed:%d\n", ret);
1640+
"SDW_SCP_INT1 recheck read failed:%d\n", ret);
16411641
goto io_err;
16421642
}
16431643
_buf = ret;
16441644

16451645
ret = sdw_nread_no_pm(slave, SDW_SCP_INTSTAT2, 2, _buf2);
16461646
if (ret < 0) {
16471647
dev_err(&slave->dev,
1648-
"SDW_SCP_INT2/3 read failed:%d\n", ret);
1648+
"SDW_SCP_INT2/3 recheck read failed:%d\n", ret);
16491649
goto io_err;
16501650
}
16511651

16521652
if (slave->prop.is_sdca) {
16531653
ret = sdw_read_no_pm(slave, SDW_DP0_INT);
16541654
if (ret < 0) {
16551655
dev_err(&slave->dev,
1656-
"SDW_DP0_INT read failed:%d\n", ret);
1656+
"SDW_DP0_INT recheck read failed:%d\n", ret);
16571657
goto io_err;
16581658
}
16591659
sdca_cascade = ret & SDW_DP0_SDCA_CASCADE;

0 commit comments

Comments
 (0)