fixup! soundwire: stream: uniquify dev_err() logs

plbossart · plbossart · commit cff3bce51a58 · 2023-01-18T19:24:09.000-06:00
Using Amadeusz's suggestion to use __func__ for consistent messages

Also fix confusions on dev_err, this should be using pr_err

Signed-off-by: Pierre-Louis Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
@@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
 
 	ret = do_bank_switch(stream);
 	if (ret < 0) {
-		dev_err(bus->dev, "do_bank_switch failed: %d\n", ret);
+		pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);
 		goto restore_params;
 	}
 
@@ -1497,7 +1497,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)
 
 	ret = do_bank_switch(stream);
 	if (ret < 0) {
-		dev_err(bus->dev, "Bank switch failed: %d\n", ret);
+		pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);
 		return ret;
 	}
 
@@ -1574,7 +1574,7 @@ static int _sdw_disable_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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,`
`1389`	`1389`
`1390`	`1390`	`ret = do_bank_switch(stream);`
`1391`	`1391`	`if (ret < 0) {`
`1392`		`- dev_err(bus->dev, "do_bank_switch failed: %d\n", ret);`
	`1392`	`+ pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);`
`1393`	`1393`	`goto restore_params;`
`1394`	`1394`	`}`
`1395`	`1395`
`@@ -1497,7 +1497,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)`
`1497`	`1497`
`1498`	`1498`	`ret = do_bank_switch(stream);`
`1499`	`1499`	`if (ret < 0) {`
`1500`		`- dev_err(bus->dev, "Bank switch failed: %d\n", ret);`
	`1500`	`+ pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);`
`1501`	`1501`	`return ret;`
`1502`	`1502`	`}`
`1503`	`1503`
`@@ -1574,7 +1574,7 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream)`
`1574`	`1574`
`1575`	`1575`	`ret = do_bank_switch(stream);`
`1576`	`1576`	`if (ret < 0) {`
`1577`		`- pr_err("Bank switch failed: %d\n", ret);`
	`1577`	`+ pr_err("%s: do_bank_switch failed: %d\n", __func__, ret);`
`1578`	`1578`	`return ret;`
`1579`	`1579`	`}`
`1580`	`1580`