aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-09-16 13:51:21 -0400
committerMark Brown <broonie@kernel.org>2016-09-24 14:42:42 -0400
commitecd286a9d8a75771f73110b990512f10dc342356 (patch)
tree3d6ed9dc1931e9ee8a011439ee3ef53d6f1ab842 /sound
parent55a92ea9cf6d6cac2f1be1bf53f0a120656b2060 (diff)
ASoC: Intel: Skylake: add missing \n to end of dev_* messages
Trival fix, some dev_* messages are missing a \n, so add it. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/bxt-sst.c6
-rw-r--r--sound/soc/intel/skylake/skl-sst-cldma.c4
-rw-r--r--sound/soc/intel/skylake/skl-sst-ipc.c12
-rw-r--r--sound/soc/intel/skylake/skl-sst.c6
-rw-r--r--sound/soc/intel/skylake/skl-topology.c18
5 files changed, 23 insertions, 23 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index 48a4ae583dd9..1d251d59bcb9 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -404,7 +404,7 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)
404 404
405 ret = skl_dsp_disable_core(ctx, core_mask); 405 ret = skl_dsp_disable_core(ctx, core_mask);
406 if (ret < 0) { 406 if (ret < 0) {
407 dev_err(ctx->dev, "Failed to disable core %d", ret); 407 dev_err(ctx->dev, "Failed to disable core %d\n", ret);
408 return ret; 408 return ret;
409 } 409 }
410 skl->cores.state[core_id] = SKL_DSP_RESET; 410 skl->cores.state[core_id] = SKL_DSP_RESET;
@@ -489,7 +489,7 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)
489 489
490 ret = sst->fw_ops.load_fw(sst); 490 ret = sst->fw_ops.load_fw(sst);
491 if (ret < 0) { 491 if (ret < 0) {
492 dev_err(dev, "Load base fw failed: %x", ret); 492 dev_err(dev, "Load base fw failed: %x\n", ret);
493 return ret; 493 return ret;
494 } 494 }
495 495
@@ -498,7 +498,7 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)
498 if (ctx->manifest.lib_count > 1) { 498 if (ctx->manifest.lib_count > 1) {
499 ret = sst->fw_ops.load_library(sst, &ctx->manifest); 499 ret = sst->fw_ops.load_library(sst, &ctx->manifest);
500 if (ret < 0) { 500 if (ret < 0) {
501 dev_err(dev, "Load Library failed : %x", ret); 501 dev_err(dev, "Load Library failed : %x\n", ret);
502 return ret; 502 return ret;
503 } 503 }
504 } 504 }
diff --git a/sound/soc/intel/skylake/skl-sst-cldma.c b/sound/soc/intel/skylake/skl-sst-cldma.c
index da2329d17f4d..efa2532114ba 100644
--- a/sound/soc/intel/skylake/skl-sst-cldma.c
+++ b/sound/soc/intel/skylake/skl-sst-cldma.c
@@ -341,14 +341,14 @@ int skl_cldma_prepare(struct sst_dsp *ctx)
341 ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev, 341 ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev,
342 &ctx->cl_dev.dmab_data, ctx->cl_dev.bufsize); 342 &ctx->cl_dev.dmab_data, ctx->cl_dev.bufsize);
343 if (ret < 0) { 343 if (ret < 0) {
344 dev_err(ctx->dev, "Alloc buffer for base fw failed: %x", ret); 344 dev_err(ctx->dev, "Alloc buffer for base fw failed: %x\n", ret);
345 return ret; 345 return ret;
346 } 346 }
347 /* Setup Code loader BDL */ 347 /* Setup Code loader BDL */
348 ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev, 348 ret = ctx->dsp_ops.alloc_dma_buf(ctx->dev,
349 &ctx->cl_dev.dmab_bdl, PAGE_SIZE); 349 &ctx->cl_dev.dmab_bdl, PAGE_SIZE);
350 if (ret < 0) { 350 if (ret < 0) {
351 dev_err(ctx->dev, "Alloc buffer for blde failed: %x", ret); 351 dev_err(ctx->dev, "Alloc buffer for blde failed: %x\n", ret);
352 ctx->dsp_ops.free_dma_buf(ctx->dev, &ctx->cl_dev.dmab_data); 352 ctx->dsp_ops.free_dma_buf(ctx->dev, &ctx->cl_dev.dmab_data);
353 return ret; 353 return ret;
354 } 354 }
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c
index 74dbecc3afaa..0bd01e62622c 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.c
+++ b/sound/soc/intel/skylake/skl-sst-ipc.c
@@ -344,7 +344,7 @@ static int skl_ipc_process_notification(struct sst_generic_ipc *ipc,
344 break; 344 break;
345 345
346 default: 346 default:
347 dev_err(ipc->dev, "ipc: Unhandled error msg=%x", 347 dev_err(ipc->dev, "ipc: Unhandled error msg=%x\n",
348 header.primary); 348 header.primary);
349 break; 349 break;
350 } 350 }
@@ -385,13 +385,13 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc,
385 break; 385 break;
386 386
387 default: 387 default:
388 dev_err(ipc->dev, "Unknown ipc reply: 0x%x", reply); 388 dev_err(ipc->dev, "Unknown ipc reply: 0x%x\n", reply);
389 msg->errno = -EINVAL; 389 msg->errno = -EINVAL;
390 break; 390 break;
391 } 391 }
392 392
393 if (reply != IPC_GLB_REPLY_SUCCESS) { 393 if (reply != IPC_GLB_REPLY_SUCCESS) {
394 dev_err(ipc->dev, "ipc FW reply: reply=%d", reply); 394 dev_err(ipc->dev, "ipc FW reply: reply=%d\n", reply);
395 dev_err(ipc->dev, "FW Error Code: %u\n", 395 dev_err(ipc->dev, "FW Error Code: %u\n",
396 ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp)); 396 ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp));
397 } 397 }
@@ -440,9 +440,9 @@ irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context)
440 hipcte = sst_dsp_shim_read_unlocked(dsp, SKL_ADSP_REG_HIPCTE); 440 hipcte = sst_dsp_shim_read_unlocked(dsp, SKL_ADSP_REG_HIPCTE);
441 header.primary = hipct; 441 header.primary = hipct;
442 header.extension = hipcte; 442 header.extension = hipcte;
443 dev_dbg(dsp->dev, "IPC irq: Firmware respond primary:%x", 443 dev_dbg(dsp->dev, "IPC irq: Firmware respond primary:%x\n",
444 header.primary); 444 header.primary);
445 dev_dbg(dsp->dev, "IPC irq: Firmware respond extension:%x", 445 dev_dbg(dsp->dev, "IPC irq: Firmware respond extension:%x\n",
446 header.extension); 446 header.extension);
447 447
448 if (IPC_GLB_NOTIFY_RSP_TYPE(header.primary)) { 448 if (IPC_GLB_NOTIFY_RSP_TYPE(header.primary)) {
@@ -749,7 +749,7 @@ int skl_ipc_bind_unbind(struct sst_generic_ipc *ipc,
749 header.extension); 749 header.extension);
750 ret = sst_ipc_tx_message_wait(ipc, *ipc_header, NULL, 0, NULL, 0); 750 ret = sst_ipc_tx_message_wait(ipc, *ipc_header, NULL, 0, NULL, 0);
751 if (ret < 0) { 751 if (ret < 0) {
752 dev_err(ipc->dev, "ipc: bind/unbind faileden"); 752 dev_err(ipc->dev, "ipc: bind/unbind failed\n");
753 return ret; 753 return ret;
754 } 754 }
755 755
diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 064fc7ee3d88..8fc3178bc79c 100644
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -107,13 +107,13 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
107 107
108 ret = skl_dsp_boot(ctx); 108 ret = skl_dsp_boot(ctx);
109 if (ret < 0) { 109 if (ret < 0) {
110 dev_err(ctx->dev, "Boot dsp core failed ret: %d", ret); 110 dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
111 goto skl_load_base_firmware_failed; 111 goto skl_load_base_firmware_failed;
112 } 112 }
113 113
114 ret = skl_cldma_prepare(ctx); 114 ret = skl_cldma_prepare(ctx);
115 if (ret < 0) { 115 if (ret < 0) {
116 dev_err(ctx->dev, "CL dma prepare failed : %d", ret); 116 dev_err(ctx->dev, "CL dma prepare failed : %d\n", ret);
117 goto skl_load_base_firmware_failed; 117 goto skl_load_base_firmware_failed;
118 } 118 }
119 119
@@ -502,7 +502,7 @@ int skl_sst_init_fw(struct device *dev, struct skl_sst *ctx)
502 502
503 ret = sst->fw_ops.load_fw(sst); 503 ret = sst->fw_ops.load_fw(sst);
504 if (ret < 0) { 504 if (ret < 0) {
505 dev_err(dev, "Load base fw failed : %d", ret); 505 dev_err(dev, "Load base fw failed : %d\n", ret);
506 return ret; 506 return ret;
507 } 507 }
508 508
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index e48f872505b1..b5b1934d8550 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1614,7 +1614,7 @@ static int skl_tplg_fill_pins_info(struct device *dev,
1614 break; 1614 break;
1615 1615
1616 default: 1616 default:
1617 dev_err(dev, "Invalid direction value"); 1617 dev_err(dev, "Invalid direction value\n");
1618 return -EINVAL; 1618 return -EINVAL;
1619 } 1619 }
1620 1620
@@ -1652,7 +1652,7 @@ static int skl_tplg_fill_fmt(struct device *dev,
1652 break; 1652 break;
1653 1653
1654 default: 1654 default:
1655 dev_err(dev, "Invalid direction value"); 1655 dev_err(dev, "Invalid direction value\n");
1656 return -EINVAL; 1656 return -EINVAL;
1657 } 1657 }
1658 1658
@@ -1690,7 +1690,7 @@ static int skl_tplg_fill_fmt(struct device *dev,
1690 break; 1690 break;
1691 1691
1692 default: 1692 default:
1693 dev_err(dev, "Invalid token %d", tkn); 1693 dev_err(dev, "Invalid token %d\n", tkn);
1694 return -EINVAL; 1694 return -EINVAL;
1695 } 1695 }
1696 1696
@@ -1703,7 +1703,7 @@ static int skl_tplg_get_uuid(struct device *dev, struct skl_module_cfg *mconfig,
1703 if (uuid_tkn->token == SKL_TKN_UUID) 1703 if (uuid_tkn->token == SKL_TKN_UUID)
1704 memcpy(&mconfig->guid, &uuid_tkn->uuid, 16); 1704 memcpy(&mconfig->guid, &uuid_tkn->uuid, 16);
1705 else { 1705 else {
1706 dev_err(dev, "Not an UUID token tkn %d", uuid_tkn->token); 1706 dev_err(dev, "Not an UUID token tkn %d\n", uuid_tkn->token);
1707 return -EINVAL; 1707 return -EINVAL;
1708 } 1708 }
1709 1709
@@ -1939,7 +1939,7 @@ static int skl_tplg_get_tokens(struct device *dev,
1939 1939
1940 switch (array->type) { 1940 switch (array->type) {
1941 case SND_SOC_TPLG_TUPLE_TYPE_STRING: 1941 case SND_SOC_TPLG_TUPLE_TYPE_STRING:
1942 dev_warn(dev, "no string tokens expected for skl tplg"); 1942 dev_warn(dev, "no string tokens expected for skl tplg\n");
1943 continue; 1943 continue;
1944 1944
1945 case SND_SOC_TPLG_TUPLE_TYPE_UUID: 1945 case SND_SOC_TPLG_TUPLE_TYPE_UUID:
@@ -1992,7 +1992,7 @@ static int skl_tplg_get_desc_blocks(struct device *dev,
1992 return tkn_elem->value; 1992 return tkn_elem->value;
1993 1993
1994 default: 1994 default:
1995 dev_err(dev, "Invalid descriptor token %d", tkn_elem->token); 1995 dev_err(dev, "Invalid descriptor token %d\n", tkn_elem->token);
1996 break; 1996 break;
1997 } 1997 }
1998 1998
@@ -2252,7 +2252,7 @@ static int skl_tplg_fill_str_mfest_tkn(struct device *dev,
2252 break; 2252 break;
2253 2253
2254 default: 2254 default:
2255 dev_err(dev, "Not a string token %d", str_elem->token); 2255 dev_err(dev, "Not a string token %d\n", str_elem->token);
2256 break; 2256 break;
2257 } 2257 }
2258 2258
@@ -2293,7 +2293,7 @@ static int skl_tplg_get_int_tkn(struct device *dev,
2293 break; 2293 break;
2294 2294
2295 default: 2295 default:
2296 dev_err(dev, "Not a manifest token %d", tkn_elem->token); 2296 dev_err(dev, "Not a manifest token %d\n", tkn_elem->token);
2297 return -EINVAL; 2297 return -EINVAL;
2298 } 2298 }
2299 2299
@@ -2332,7 +2332,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev,
2332 continue; 2332 continue;
2333 2333
2334 case SND_SOC_TPLG_TUPLE_TYPE_UUID: 2334 case SND_SOC_TPLG_TUPLE_TYPE_UUID:
2335 dev_warn(dev, "no uuid tokens for skl tplf manifest"); 2335 dev_warn(dev, "no uuid tokens for skl tplf manifest\n");
2336 continue; 2336 continue;
2337 2337
2338 default: 2338 default: