Skip to content

Commit

Permalink
ASoC: Intel: Skylake: add missing \n to end of dev_* messages
Browse files Browse the repository at this point in the history 
Trival fix, some dev_* messages are missing a \n, so add it.

Signed-off-by: Colin Ian King <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
@broonie
Colin Ian King authored and broonie committed Sep 24, 2016
1 parent 55a92ea commit ecd286a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions sound/soc/intel/skylake/bxt-sst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)

ret = skl_dsp_disable_core(ctx, core_mask);
if (ret < 0) {
dev_err(ctx->dev, "Failed to disable core %d", ret);
dev_err(ctx->dev, "Failed to disable core %d\n", ret);
return ret;
}
skl->cores.state[core_id] = SKL_DSP_RESET;
Expand Down Expand Up @@ -489,7 +489,7 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)

ret = sst->fw_ops.load_fw(sst);
if (ret < 0) {
dev_err(dev, "Load base fw failed: %x", ret);
dev_err(dev, "Load base fw failed: %x\n", ret);
return ret;
}

Expand All @@ -498,7 +498,7 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)
if (ctx->manifest.lib_count > 1) {
ret = sst->fw_ops.load_library(sst, &ctx->manifest);
if (ret < 0) {
dev_err(dev, "Load Library failed : %x", ret);
dev_err(dev, "Load Library failed : %x\n", ret);
return ret;
}
}
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/intel/skylake/skl-sst-cldma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,14 @@ int skl_cldma_prepare(struct sst_dsp *ctx)
ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev,
&ctx->cl_dev.dmab_data, ctx->cl_dev.bufsize);
if (ret < 0) {
dev_err(ctx->dev, "Alloc buffer for base fw failed: %x", ret);
dev_err(ctx->dev, "Alloc buffer for base fw failed: %x\n", ret);
return ret;
}
/* Setup Code loader BDL */
ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev,
&ctx->cl_dev.dmab_bdl, PAGE_SIZE);
if (ret < 0) {
dev_err(ctx->dev, "Alloc buffer for blde failed: %x", ret);
dev_err(ctx->dev, "Alloc buffer for blde failed: %x\n", ret);
ctx->dsp_ops.free_dma_buf(ctx->dev, &ctx->cl_dev.dmab_data);
return ret;
}
Expand Down
12 changes: 6 additions & 6 deletions sound/soc/intel/skylake/skl-sst-ipc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int skl_ipc_process_notification(struct sst_generic_ipc *ipc,
break;

default:
dev_err(ipc->dev, "ipc: Unhandled error msg=%x",
dev_err(ipc->dev, "ipc: Unhandled error msg=%x\n",
header.primary);
break;
}
Expand Down Expand Up @@ -385,13 +385,13 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc,
break;

default:
dev_err(ipc->dev, "Unknown ipc reply: 0x%x", reply);
dev_err(ipc->dev, "Unknown ipc reply: 0x%x\n", reply);
msg->errno = -EINVAL;
break;
}

if (reply != IPC_GLB_REPLY_SUCCESS) {
dev_err(ipc->dev, "ipc FW reply: reply=%d", reply);
dev_err(ipc->dev, "ipc FW reply: reply=%d\n", reply);
dev_err(ipc->dev, "FW Error Code: %u\n",
ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp));
}
Expand Down Expand Up @@ -440,9 +440,9 @@ irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context)
hipcte = sst_dsp_shim_read_unlocked(dsp, SKL_ADSP_REG_HIPCTE);
header.primary = hipct;
header.extension = hipcte;
dev_dbg(dsp->dev, "IPC irq: Firmware respond primary:%x",
dev_dbg(dsp->dev, "IPC irq: Firmware respond primary:%x\n",
header.primary);
dev_dbg(dsp->dev, "IPC irq: Firmware respond extension:%x",
dev_dbg(dsp->dev, "IPC irq: Firmware respond extension:%x\n",
header.extension);

if (IPC_GLB_NOTIFY_RSP_TYPE(header.primary)) {
Expand Down Expand Up @@ -749,7 +749,7 @@ int skl_ipc_bind_unbind(struct sst_generic_ipc *ipc,
header.extension);
ret = sst_ipc_tx_message_wait(ipc, *ipc_header, NULL, 0, NULL, 0);
if (ret < 0) {
dev_err(ipc->dev, "ipc: bind/unbind faileden");
dev_err(ipc->dev, "ipc: bind/unbind failed\n");
return ret;
}

Expand Down
6 changes: 3 additions & 3 deletions sound/soc/intel/skylake/skl-sst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)

ret = skl_dsp_boot(ctx);
if (ret < 0) {
dev_err(ctx->dev, "Boot dsp core failed ret: %d", ret);
dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
goto skl_load_base_firmware_failed;
}

ret = skl_cldma_prepare(ctx);
if (ret < 0) {
dev_err(ctx->dev, "CL dma prepare failed : %d", ret);
dev_err(ctx->dev, "CL dma prepare failed : %d\n", ret);
goto skl_load_base_firmware_failed;
}

Expand Down Expand Up @@ -502,7 +502,7 @@ int skl_sst_init_fw(struct device *dev, struct skl_sst *ctx)

ret = sst->fw_ops.load_fw(sst);
if (ret < 0) {
dev_err(dev, "Load base fw failed : %d", ret);
dev_err(dev, "Load base fw failed : %d\n", ret);
return ret;
}

Expand Down
18 changes: 9 additions & 9 deletions sound/soc/intel/skylake/skl-topology.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ static int skl_tplg_fill_pins_info(struct device *dev,
break;

default:
dev_err(dev, "Invalid direction value");
dev_err(dev, "Invalid direction value\n");
return -EINVAL;
}

Expand Down Expand Up @@ -1652,7 +1652,7 @@ static int skl_tplg_fill_fmt(struct device *dev,
break;

default:
dev_err(dev, "Invalid direction value");
dev_err(dev, "Invalid direction value\n");
return -EINVAL;
}

Expand Down Expand Up @@ -1690,7 +1690,7 @@ static int skl_tplg_fill_fmt(struct device *dev,
break;

default:
dev_err(dev, "Invalid token %d", tkn);
dev_err(dev, "Invalid token %d\n", tkn);
return -EINVAL;
}

Expand All @@ -1703,7 +1703,7 @@ static int skl_tplg_get_uuid(struct device *dev, struct skl_module_cfg *mconfig,
if (uuid_tkn->token == SKL_TKN_UUID)
memcpy(&mconfig->guid, &uuid_tkn->uuid, 16);
else {
dev_err(dev, "Not an UUID token tkn %d", uuid_tkn->token);
dev_err(dev, "Not an UUID token tkn %d\n", uuid_tkn->token);
return -EINVAL;
}

Expand Down Expand Up @@ -1939,7 +1939,7 @@ static int skl_tplg_get_tokens(struct device *dev,

switch (array->type) {
case SND_SOC_TPLG_TUPLE_TYPE_STRING:
dev_warn(dev, "no string tokens expected for skl tplg");
dev_warn(dev, "no string tokens expected for skl tplg\n");
continue;

case SND_SOC_TPLG_TUPLE_TYPE_UUID:
Expand Down Expand Up @@ -1992,7 +1992,7 @@ static int skl_tplg_get_desc_blocks(struct device *dev,
return tkn_elem->value;

default:
dev_err(dev, "Invalid descriptor token %d", tkn_elem->token);
dev_err(dev, "Invalid descriptor token %d\n", tkn_elem->token);
break;
}

Expand Down Expand Up @@ -2252,7 +2252,7 @@ static int skl_tplg_fill_str_mfest_tkn(struct device *dev,
break;

default:
dev_err(dev, "Not a string token %d", str_elem->token);
dev_err(dev, "Not a string token %d\n", str_elem->token);
break;
}

Expand Down Expand Up @@ -2293,7 +2293,7 @@ static int skl_tplg_get_int_tkn(struct device *dev,
break;

default:
dev_err(dev, "Not a manifest token %d", tkn_elem->token);
dev_err(dev, "Not a manifest token %d\n", tkn_elem->token);
return -EINVAL;
}

Expand Down Expand Up @@ -2332,7 +2332,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev,
continue;

case SND_SOC_TPLG_TUPLE_TYPE_UUID:
dev_warn(dev, "no uuid tokens for skl tplf manifest");
dev_warn(dev, "no uuid tokens for skl tplf manifest\n");
continue;

default:
Expand Down

0 comments on commit ecd286a

Please sign in to comment.