Commit 17ed5bef authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman

soundwire: add missing newlines in dynamic debug logs

For some reason the newlines are not used everywhere. Fix as needed.
Reported-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d2ab7e9
...@@ -21,12 +21,12 @@ int sdw_add_bus_master(struct sdw_bus *bus) ...@@ -21,12 +21,12 @@ int sdw_add_bus_master(struct sdw_bus *bus)
int ret; int ret;
if (!bus->dev) { if (!bus->dev) {
pr_err("SoundWire bus has no device"); pr_err("SoundWire bus has no device\n");
return -ENODEV; return -ENODEV;
} }
if (!bus->ops) { if (!bus->ops) {
dev_err(bus->dev, "SoundWire Bus ops are not set"); dev_err(bus->dev, "SoundWire Bus ops are not set\n");
return -EINVAL; return -EINVAL;
} }
...@@ -43,7 +43,7 @@ int sdw_add_bus_master(struct sdw_bus *bus) ...@@ -43,7 +43,7 @@ int sdw_add_bus_master(struct sdw_bus *bus)
if (bus->ops->read_prop) { if (bus->ops->read_prop) {
ret = bus->ops->read_prop(bus); ret = bus->ops->read_prop(bus);
if (ret < 0) { if (ret < 0) {
dev_err(bus->dev, "Bus read properties failed:%d", ret); dev_err(bus->dev, "Bus read properties failed:%d\n", ret);
return ret; return ret;
} }
} }
...@@ -296,7 +296,7 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave, ...@@ -296,7 +296,7 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,
return -EINVAL; return -EINVAL;
} else if (!slave->prop.paging_support) { } else if (!slave->prop.paging_support) {
dev_err(&slave->dev, dev_err(&slave->dev,
"address %x needs paging but no support", addr); "address %x needs paging but no support\n", addr);
return -EINVAL; return -EINVAL;
} }
...@@ -455,13 +455,13 @@ static int sdw_assign_device_num(struct sdw_slave *slave) ...@@ -455,13 +455,13 @@ static int sdw_assign_device_num(struct sdw_slave *slave)
dev_num = sdw_get_device_num(slave); dev_num = sdw_get_device_num(slave);
mutex_unlock(&slave->bus->bus_lock); mutex_unlock(&slave->bus->bus_lock);
if (dev_num < 0) { if (dev_num < 0) {
dev_err(slave->bus->dev, "Get dev_num failed: %d", dev_err(slave->bus->dev, "Get dev_num failed: %d\n",
dev_num); dev_num);
return dev_num; return dev_num;
} }
} else { } else {
dev_info(slave->bus->dev, dev_info(slave->bus->dev,
"Slave already registered dev_num:%d", "Slave already registered dev_num:%d\n",
slave->dev_num); slave->dev_num);
/* Clear the slave->dev_num to transfer message on device 0 */ /* Clear the slave->dev_num to transfer message on device 0 */
...@@ -472,7 +472,7 @@ static int sdw_assign_device_num(struct sdw_slave *slave) ...@@ -472,7 +472,7 @@ static int sdw_assign_device_num(struct sdw_slave *slave)
ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num); ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num);
if (ret < 0) { if (ret < 0) {
dev_err(&slave->dev, "Program device_num failed: %d", ret); dev_err(&slave->dev, "Program device_num failed: %d\n", ret);
return ret; return ret;
} }
...@@ -485,7 +485,7 @@ static int sdw_assign_device_num(struct sdw_slave *slave) ...@@ -485,7 +485,7 @@ static int sdw_assign_device_num(struct sdw_slave *slave)
void sdw_extract_slave_id(struct sdw_bus *bus, void sdw_extract_slave_id(struct sdw_bus *bus,
u64 addr, struct sdw_slave_id *id) u64 addr, struct sdw_slave_id *id)
{ {
dev_dbg(bus->dev, "SDW Slave Addr: %llx", addr); dev_dbg(bus->dev, "SDW Slave Addr: %llx\n", addr);
/* /*
* Spec definition * Spec definition
...@@ -505,7 +505,7 @@ void sdw_extract_slave_id(struct sdw_bus *bus, ...@@ -505,7 +505,7 @@ void sdw_extract_slave_id(struct sdw_bus *bus,
id->class_id = addr & GENMASK(7, 0); id->class_id = addr & GENMASK(7, 0);
dev_dbg(bus->dev, dev_dbg(bus->dev,
"SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x", "SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x\n",
id->class_id, id->part_id, id->mfg_id, id->class_id, id->part_id, id->mfg_id,
id->unique_id, id->sdw_version); id->unique_id, id->sdw_version);
...@@ -562,7 +562,7 @@ static int sdw_program_device_num(struct sdw_bus *bus) ...@@ -562,7 +562,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)
ret = sdw_assign_device_num(slave); ret = sdw_assign_device_num(slave);
if (ret) { if (ret) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"Assign dev_num failed:%d", "Assign dev_num failed:%d\n",
ret); ret);
return ret; return ret;
} }
...@@ -573,7 +573,7 @@ static int sdw_program_device_num(struct sdw_bus *bus) ...@@ -573,7 +573,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)
if (!found) { if (!found) {
/* TODO: Park this device in Group 13 */ /* TODO: Park this device in Group 13 */
dev_err(bus->dev, "Slave Entry not found"); dev_err(bus->dev, "Slave Entry not found\n");
} }
count++; count++;
...@@ -618,7 +618,7 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave, ...@@ -618,7 +618,7 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave,
ret = sdw_update(slave, addr, (mask | SDW_DPN_INT_PORT_READY), val); ret = sdw_update(slave, addr, (mask | SDW_DPN_INT_PORT_READY), val);
if (ret < 0) if (ret < 0)
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DPN_INTMASK write failed:%d", val); "SDW_DPN_INTMASK write failed:%d\n", val);
return ret; return ret;
} }
...@@ -642,7 +642,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave) ...@@ -642,7 +642,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
ret = sdw_update(slave, SDW_SCP_INTMASK1, val, val); ret = sdw_update(slave, SDW_SCP_INTMASK1, val, val);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INTMASK1 write failed:%d", ret); "SDW_SCP_INTMASK1 write failed:%d\n", ret);
return ret; return ret;
} }
...@@ -657,7 +657,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave) ...@@ -657,7 +657,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
ret = sdw_update(slave, SDW_DP0_INTMASK, val, val); ret = sdw_update(slave, SDW_DP0_INTMASK, val, val);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DP0_INTMASK read failed:%d", ret); "SDW_DP0_INTMASK read failed:%d\n", ret);
return val; return val;
} }
...@@ -672,14 +672,14 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) ...@@ -672,14 +672,14 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)
status = sdw_read(slave, SDW_DP0_INT); status = sdw_read(slave, SDW_DP0_INT);
if (status < 0) { if (status < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DP0_INT read failed:%d", status); "SDW_DP0_INT read failed:%d\n", status);
return status; return status;
} }
do { do {
if (status & SDW_DP0_INT_TEST_FAIL) { if (status & SDW_DP0_INT_TEST_FAIL) {
dev_err(&slave->dev, "Test fail for port 0"); dev_err(&slave->dev, "Test fail for port 0\n");
clear |= SDW_DP0_INT_TEST_FAIL; clear |= SDW_DP0_INT_TEST_FAIL;
} }
...@@ -694,7 +694,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) ...@@ -694,7 +694,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)
} }
if (status & SDW_DP0_INT_BRA_FAILURE) { if (status & SDW_DP0_INT_BRA_FAILURE) {
dev_err(&slave->dev, "BRA failed"); dev_err(&slave->dev, "BRA failed\n");
clear |= SDW_DP0_INT_BRA_FAILURE; clear |= SDW_DP0_INT_BRA_FAILURE;
} }
...@@ -710,7 +710,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) ...@@ -710,7 +710,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)
ret = sdw_write(slave, SDW_DP0_INT, clear); ret = sdw_write(slave, SDW_DP0_INT, clear);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DP0_INT write failed:%d", ret); "SDW_DP0_INT write failed:%d\n", ret);
return ret; return ret;
} }
...@@ -718,7 +718,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) ...@@ -718,7 +718,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)
status2 = sdw_read(slave, SDW_DP0_INT); status2 = sdw_read(slave, SDW_DP0_INT);
if (status2 < 0) { if (status2 < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DP0_INT read failed:%d", status2); "SDW_DP0_INT read failed:%d\n", status2);
return status2; return status2;
} }
status &= status2; status &= status2;
...@@ -729,7 +729,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) ...@@ -729,7 +729,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)
} while (status != 0 && count < SDW_READ_INTR_CLEAR_RETRY); } while (status != 0 && count < SDW_READ_INTR_CLEAR_RETRY);
if (count == SDW_READ_INTR_CLEAR_RETRY) if (count == SDW_READ_INTR_CLEAR_RETRY)
dev_warn(slave->bus->dev, "Reached MAX_RETRY on DP0 read"); dev_warn(slave->bus->dev, "Reached MAX_RETRY on DP0 read\n");
return ret; return ret;
} }
...@@ -748,7 +748,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, ...@@ -748,7 +748,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,
status = sdw_read(slave, addr); status = sdw_read(slave, addr);
if (status < 0) { if (status < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DPN_INT read failed:%d", status); "SDW_DPN_INT read failed:%d\n", status);
return status; return status;
} }
...@@ -756,7 +756,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, ...@@ -756,7 +756,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,
do { do {
if (status & SDW_DPN_INT_TEST_FAIL) { if (status & SDW_DPN_INT_TEST_FAIL) {
dev_err(&slave->dev, "Test fail for port:%d", port); dev_err(&slave->dev, "Test fail for port:%d\n", port);
clear |= SDW_DPN_INT_TEST_FAIL; clear |= SDW_DPN_INT_TEST_FAIL;
} }
...@@ -781,7 +781,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, ...@@ -781,7 +781,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,
ret = sdw_write(slave, addr, clear); ret = sdw_write(slave, addr, clear);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DPN_INT write failed:%d", ret); "SDW_DPN_INT write failed:%d\n", ret);
return ret; return ret;
} }
...@@ -789,7 +789,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, ...@@ -789,7 +789,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,
status2 = sdw_read(slave, addr); status2 = sdw_read(slave, addr);
if (status2 < 0) { if (status2 < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_DPN_INT read failed:%d", status2); "SDW_DPN_INT read failed:%d\n", status2);
return status2; return status2;
} }
status &= status2; status &= status2;
...@@ -820,14 +820,14 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) ...@@ -820,14 +820,14 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
buf = ret = sdw_read(slave, SDW_SCP_INT1); buf = ret = sdw_read(slave, SDW_SCP_INT1);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INT1 read failed:%d", ret); "SDW_SCP_INT1 read failed:%d\n", ret);
return ret; return ret;
} }
ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, buf2); ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, buf2);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INT2/3 read failed:%d", ret); "SDW_SCP_INT2/3 read failed:%d\n", ret);
return ret; return ret;
} }
...@@ -837,12 +837,12 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) ...@@ -837,12 +837,12 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
* interrupt * interrupt
*/ */
if (buf & SDW_SCP_INT1_PARITY) { if (buf & SDW_SCP_INT1_PARITY) {
dev_err(&slave->dev, "Parity error detected"); dev_err(&slave->dev, "Parity error detected\n");
clear |= SDW_SCP_INT1_PARITY; clear |= SDW_SCP_INT1_PARITY;
} }
if (buf & SDW_SCP_INT1_BUS_CLASH) { if (buf & SDW_SCP_INT1_BUS_CLASH) {
dev_err(&slave->dev, "Bus clash error detected"); dev_err(&slave->dev, "Bus clash error detected\n");
clear |= SDW_SCP_INT1_BUS_CLASH; clear |= SDW_SCP_INT1_BUS_CLASH;
} }
...@@ -908,7 +908,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) ...@@ -908,7 +908,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
ret = sdw_write(slave, SDW_SCP_INT1, clear); ret = sdw_write(slave, SDW_SCP_INT1, clear);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INT1 write failed:%d", ret); "SDW_SCP_INT1 write failed:%d\n", ret);
return ret; return ret;
} }
...@@ -919,14 +919,14 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) ...@@ -919,14 +919,14 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
_buf = ret = sdw_read(slave, SDW_SCP_INT1); _buf = ret = sdw_read(slave, SDW_SCP_INT1);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INT1 read failed:%d", ret); "SDW_SCP_INT1 read failed:%d\n", ret);
return ret; return ret;
} }
ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, _buf2); ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, _buf2);
if (ret < 0) { if (ret < 0) {
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"SDW_SCP_INT2/3 read failed:%d", ret); "SDW_SCP_INT2/3 read failed:%d\n", ret);
return ret; return ret;
} }
...@@ -946,7 +946,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) ...@@ -946,7 +946,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
} while (stat != 0 && count < SDW_READ_INTR_CLEAR_RETRY); } while (stat != 0 && count < SDW_READ_INTR_CLEAR_RETRY);
if (count == SDW_READ_INTR_CLEAR_RETRY) if (count == SDW_READ_INTR_CLEAR_RETRY)
dev_warn(slave->bus->dev, "Reached MAX_RETRY on alert read"); dev_warn(slave->bus->dev, "Reached MAX_RETRY on alert read\n");
return ret; return ret;
} }
...@@ -975,7 +975,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus, ...@@ -975,7 +975,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
if (status[0] == SDW_SLAVE_ATTACHED) { if (status[0] == SDW_SLAVE_ATTACHED) {
ret = sdw_program_device_num(bus); ret = sdw_program_device_num(bus);
if (ret) if (ret)
dev_err(bus->dev, "Slave attach failed: %d", ret); dev_err(bus->dev, "Slave attach failed: %d\n", ret);
} }
/* Continue to check other slave statuses */ /* Continue to check other slave statuses */
...@@ -1003,7 +1003,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus, ...@@ -1003,7 +1003,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
ret = sdw_handle_slave_alerts(slave); ret = sdw_handle_slave_alerts(slave);
if (ret) if (ret)
dev_err(bus->dev, dev_err(bus->dev,
"Slave %d alert handling failed: %d", "Slave %d alert handling failed: %d\n",
i, ret); i, ret);
break; break;
...@@ -1020,13 +1020,13 @@ int sdw_handle_slave_status(struct sdw_bus *bus, ...@@ -1020,13 +1020,13 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
ret = sdw_initialize_slave(slave); ret = sdw_initialize_slave(slave);
if (ret) if (ret)
dev_err(bus->dev, dev_err(bus->dev,
"Slave %d initialization failed: %d", "Slave %d initialization failed: %d\n",
i, ret); i, ret);
break; break;
default: default:
dev_err(bus->dev, "Invalid slave %d status:%d", dev_err(bus->dev, "Invalid slave %d status:%d\n",
i, status[i]); i, status[i]);
break; break;
} }
...@@ -1034,7 +1034,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus, ...@@ -1034,7 +1034,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
ret = sdw_update_slave_status(slave, status[i]); ret = sdw_update_slave_status(slave, status[i]);
if (ret) if (ret)
dev_err(slave->bus->dev, dev_err(slave->bus->dev,
"Update Slave status failed:%d", ret); "Update Slave status failed:%d\n", ret);
} }
......
...@@ -346,10 +346,10 @@ cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg) ...@@ -346,10 +346,10 @@ cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg)
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (!(cdns->response_buf[i] & CDNS_MCP_RESP_ACK)) { if (!(cdns->response_buf[i] & CDNS_MCP_RESP_ACK)) {
no_ack = 1; no_ack = 1;
dev_err(cdns->dev, "Program SCP Ack not received"); dev_err(cdns->dev, "Program SCP Ack not received\n");
if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) { if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) {
nack = 1; nack = 1;
dev_err(cdns->dev, "Program SCP NACK received"); dev_err(cdns->dev, "Program SCP NACK received\n");
} }
} }
} }
...@@ -357,11 +357,11 @@ cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg) ...@@ -357,11 +357,11 @@ cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg)
/* For NACK, NO ack, don't return err if we are in Broadcast mode */ /* For NACK, NO ack, don't return err if we are in Broadcast mode */
if (nack) { if (nack) {
dev_err(cdns->dev, dev_err(cdns->dev,
"SCP_addrpage NACKed for Slave %d", msg->dev_num); "SCP_addrpage NACKed for Slave %d\n", msg->dev_num);
return SDW_CMD_FAIL; return SDW_CMD_FAIL;
} else if (no_ack) { } else if (no_ack) {
dev_dbg(cdns->dev, dev_dbg(cdns->dev,
"SCP_addrpage ignored for Slave %d", msg->dev_num); "SCP_addrpage ignored for Slave %d\n", msg->dev_num);
return SDW_CMD_IGNORED; return SDW_CMD_IGNORED;
} }
...@@ -665,7 +665,7 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) ...@@ -665,7 +665,7 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns)
ret = cdns_clear_bit(cdns, CDNS_MCP_CONFIG_UPDATE, ret = cdns_clear_bit(cdns, CDNS_MCP_CONFIG_UPDATE,
CDNS_MCP_CONFIG_UPDATE_BIT); CDNS_MCP_CONFIG_UPDATE_BIT);
if (ret < 0) if (ret < 0)
dev_err(cdns->dev, "Config update timedout"); dev_err(cdns->dev, "Config update timedout\n");
return ret; return ret;
} }
...@@ -853,7 +853,7 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params) ...@@ -853,7 +853,7 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)
int divider; int divider;
if (!params->curr_dr_freq) { if (!params->curr_dr_freq) {
dev_err(cdns->dev, "NULL curr_dr_freq"); dev_err(cdns->dev, "NULL curr_dr_freq\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -238,7 +238,7 @@ static int intel_shim_init(struct sdw_intel *sdw) ...@@ -238,7 +238,7 @@ static int intel_shim_init(struct sdw_intel *sdw)
ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg, ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg,
SDW_SHIM_SYNC_SYNCCPU); SDW_SHIM_SYNC_SYNCCPU);
if (ret < 0) if (ret < 0)
dev_err(sdw->cdns.dev, "Failed to set sync period: %d", ret); dev_err(sdw->cdns.dev, "Failed to set sync period: %d\n", ret);
return ret; return ret;
} }
...@@ -456,7 +456,7 @@ static int intel_post_bank_switch(struct sdw_bus *bus) ...@@ -456,7 +456,7 @@ static int intel_post_bank_switch(struct sdw_bus *bus)
ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg, ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg,
SDW_SHIM_SYNC_SYNCGO); SDW_SHIM_SYNC_SYNCGO);
if (ret < 0) if (ret < 0)
dev_err(sdw->cdns.dev, "Post bank switch failed: %d", ret); dev_err(sdw->cdns.dev, "Post bank switch failed: %d\n", ret);
return ret; return ret;
} }
...@@ -556,7 +556,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream, ...@@ -556,7 +556,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
} }
if (!dma->nr_ports) { if (!dma->nr_ports) {
dev_err(dai->dev, "ports/resources not available"); dev_err(dai->dev, "ports/resources not available\n");
return -EINVAL; return -EINVAL;
} }
...@@ -607,7 +607,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream, ...@@ -607,7 +607,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
ret = sdw_stream_add_master(&cdns->bus, &sconfig, ret = sdw_stream_add_master(&cdns->bus, &sconfig,
pconfig, dma->nr_ports, dma->stream); pconfig, dma->nr_ports, dma->stream);
if (ret) { if (ret) {
dev_err(cdns->dev, "add master to stream failed:%d", ret); dev_err(cdns->dev, "add master to stream failed:%d\n", ret);
goto stream_error; goto stream_error;
} }
...@@ -635,7 +635,7 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) ...@@ -635,7 +635,7 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
ret = sdw_stream_remove_master(&cdns->bus, dma->stream); ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
if (ret < 0) if (ret < 0)
dev_err(dai->dev, "remove master from stream %s failed: %d", dev_err(dai->dev, "remove master from stream %s failed: %d\n",
dma->stream->name, ret); dma->stream->name, ret);
intel_port_cleanup(dma); intel_port_cleanup(dma);
...@@ -884,7 +884,7 @@ static int intel_probe(struct platform_device *pdev) ...@@ -884,7 +884,7 @@ static int intel_probe(struct platform_device *pdev)
/* Register DAIs */ /* Register DAIs */
ret = intel_register_dai(sdw); ret = intel_register_dai(sdw);
if (ret) { if (ret) {
dev_err(sdw->cdns.dev, "DAI registration failed: %d", ret); dev_err(sdw->cdns.dev, "DAI registration failed: %d\n", ret);
snd_soc_unregister_component(sdw->cdns.dev); snd_soc_unregister_component(sdw->cdns.dev);
goto err_dai; goto err_dai;
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment