Skip to content

Commit 5469484

Browse files
Chen Nibroonie
Chen Ni
authored and
broonie
committed
ASoC: topology-test: Convert comma to semicolon
Replace comma between expressions with semicolons. Using a ',' in place of a ';' can have unintended side effects. Although that is not the case here, it is seems best to use ';' unless ',' is intended. Found by inspection. No functional change intended. Compile tested only. Signed-off-by: Chen Ni <nichen@iscas.ac.cn> Link: https://patch.msgid.link/20240905032148.1929393-1-nichen@iscas.ac.cn Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d39b510 commit 5469484

1 file changed

Lines changed: 66 additions & 66 deletions

File tree

‎sound/soc/soc-topology-test.c‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,12 @@ static void snd_soc_tplg_test_load_with_null_comp(struct kunit *test)
244244
kunit_comp->kunit = test;
245245
kunit_comp->expect = -EINVAL; /* expect failure */
246246

247-
kunit_comp->card.dev = test_dev,
248-
kunit_comp->card.name = "kunit-card",
249-
kunit_comp->card.owner = THIS_MODULE,
250-
kunit_comp->card.dai_link = kunit_dai_links,
251-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
252-
kunit_comp->card.fully_routed = true,
247+
kunit_comp->card.dev = test_dev;
248+
kunit_comp->card.name = "kunit-card";
249+
kunit_comp->card.owner = THIS_MODULE;
250+
kunit_comp->card.dai_link = kunit_dai_links;
251+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
252+
kunit_comp->card.fully_routed = true;
253253

254254
/* run test */
255255
ret = snd_soc_register_card(&kunit_comp->card);
@@ -286,12 +286,12 @@ static void snd_soc_tplg_test_load_with_null_ops(struct kunit *test)
286286
kunit_comp->kunit = test;
287287
kunit_comp->expect = 0; /* expect success */
288288

289-
kunit_comp->card.dev = test_dev,
290-
kunit_comp->card.name = "kunit-card",
291-
kunit_comp->card.owner = THIS_MODULE,
292-
kunit_comp->card.dai_link = kunit_dai_links,
293-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
294-
kunit_comp->card.fully_routed = true,
289+
kunit_comp->card.dev = test_dev;
290+
kunit_comp->card.name = "kunit-card";
291+
kunit_comp->card.owner = THIS_MODULE;
292+
kunit_comp->card.dai_link = kunit_dai_links;
293+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
294+
kunit_comp->card.fully_routed = true;
295295

296296
/* run test */
297297
ret = snd_soc_register_card(&kunit_comp->card);
@@ -348,12 +348,12 @@ static void snd_soc_tplg_test_load_with_null_fw(struct kunit *test)
348348
kunit_comp->kunit = test;
349349
kunit_comp->expect = -EINVAL; /* expect failure */
350350

351-
kunit_comp->card.dev = test_dev,
352-
kunit_comp->card.name = "kunit-card",
353-
kunit_comp->card.owner = THIS_MODULE,
354-
kunit_comp->card.dai_link = kunit_dai_links,
355-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
356-
kunit_comp->card.fully_routed = true,
351+
kunit_comp->card.dev = test_dev;
352+
kunit_comp->card.name = "kunit-card";
353+
kunit_comp->card.owner = THIS_MODULE;
354+
kunit_comp->card.dai_link = kunit_dai_links;
355+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
356+
kunit_comp->card.fully_routed = true;
357357

358358
/* run test */
359359
ret = snd_soc_register_card(&kunit_comp->card);
@@ -396,12 +396,12 @@ static void snd_soc_tplg_test_load_empty_tplg(struct kunit *test)
396396
kunit_comp->fw.data = (u8 *)data;
397397
kunit_comp->fw.size = size;
398398

399-
kunit_comp->card.dev = test_dev,
400-
kunit_comp->card.name = "kunit-card",
401-
kunit_comp->card.owner = THIS_MODULE,
402-
kunit_comp->card.dai_link = kunit_dai_links,
403-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
404-
kunit_comp->card.fully_routed = true,
399+
kunit_comp->card.dev = test_dev;
400+
kunit_comp->card.name = "kunit-card";
401+
kunit_comp->card.owner = THIS_MODULE;
402+
kunit_comp->card.dai_link = kunit_dai_links;
403+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
404+
kunit_comp->card.fully_routed = true;
405405

406406
/* run test */
407407
ret = snd_soc_register_card(&kunit_comp->card);
@@ -451,12 +451,12 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_magic(struct kunit *test)
451451
kunit_comp->fw.data = (u8 *)data;
452452
kunit_comp->fw.size = size;
453453

454-
kunit_comp->card.dev = test_dev,
455-
kunit_comp->card.name = "kunit-card",
456-
kunit_comp->card.owner = THIS_MODULE,
457-
kunit_comp->card.dai_link = kunit_dai_links,
458-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
459-
kunit_comp->card.fully_routed = true,
454+
kunit_comp->card.dev = test_dev;
455+
kunit_comp->card.name = "kunit-card";
456+
kunit_comp->card.owner = THIS_MODULE;
457+
kunit_comp->card.dai_link = kunit_dai_links;
458+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
459+
kunit_comp->card.fully_routed = true;
460460

461461
/* run test */
462462
ret = snd_soc_register_card(&kunit_comp->card);
@@ -506,12 +506,12 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_abi(struct kunit *test)
506506
kunit_comp->fw.data = (u8 *)data;
507507
kunit_comp->fw.size = size;
508508

509-
kunit_comp->card.dev = test_dev,
510-
kunit_comp->card.name = "kunit-card",
511-
kunit_comp->card.owner = THIS_MODULE,
512-
kunit_comp->card.dai_link = kunit_dai_links,
513-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
514-
kunit_comp->card.fully_routed = true,
509+
kunit_comp->card.dev = test_dev;
510+
kunit_comp->card.name = "kunit-card";
511+
kunit_comp->card.owner = THIS_MODULE;
512+
kunit_comp->card.dai_link = kunit_dai_links;
513+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
514+
kunit_comp->card.fully_routed = true;
515515

516516
/* run test */
517517
ret = snd_soc_register_card(&kunit_comp->card);
@@ -561,12 +561,12 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_size(struct kunit *test)
561561
kunit_comp->fw.data = (u8 *)data;
562562
kunit_comp->fw.size = size;
563563

564-
kunit_comp->card.dev = test_dev,
565-
kunit_comp->card.name = "kunit-card",
566-
kunit_comp->card.owner = THIS_MODULE,
567-
kunit_comp->card.dai_link = kunit_dai_links,
568-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
569-
kunit_comp->card.fully_routed = true,
564+
kunit_comp->card.dev = test_dev;
565+
kunit_comp->card.name = "kunit-card";
566+
kunit_comp->card.owner = THIS_MODULE;
567+
kunit_comp->card.dai_link = kunit_dai_links;
568+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
569+
kunit_comp->card.fully_routed = true;
570570

571571
/* run test */
572572
ret = snd_soc_register_card(&kunit_comp->card);
@@ -617,12 +617,12 @@ static void snd_soc_tplg_test_load_empty_tplg_bad_payload_size(struct kunit *tes
617617
kunit_comp->fw.data = (u8 *)data;
618618
kunit_comp->fw.size = size;
619619

620-
kunit_comp->card.dev = test_dev,
621-
kunit_comp->card.name = "kunit-card",
622-
kunit_comp->card.owner = THIS_MODULE,
623-
kunit_comp->card.dai_link = kunit_dai_links,
624-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
625-
kunit_comp->card.fully_routed = true,
620+
kunit_comp->card.dev = test_dev;
621+
kunit_comp->card.name = "kunit-card";
622+
kunit_comp->card.owner = THIS_MODULE;
623+
kunit_comp->card.dai_link = kunit_dai_links;
624+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
625+
kunit_comp->card.fully_routed = true;
626626

627627
/* run test */
628628
ret = snd_soc_register_card(&kunit_comp->card);
@@ -665,12 +665,12 @@ static void snd_soc_tplg_test_load_pcm_tplg(struct kunit *test)
665665
kunit_comp->fw.data = data;
666666
kunit_comp->fw.size = size;
667667

668-
kunit_comp->card.dev = test_dev,
669-
kunit_comp->card.name = "kunit-card",
670-
kunit_comp->card.owner = THIS_MODULE,
671-
kunit_comp->card.dai_link = kunit_dai_links,
672-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
673-
kunit_comp->card.fully_routed = true,
668+
kunit_comp->card.dev = test_dev;
669+
kunit_comp->card.name = "kunit-card";
670+
kunit_comp->card.owner = THIS_MODULE;
671+
kunit_comp->card.dai_link = kunit_dai_links;
672+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
673+
kunit_comp->card.fully_routed = true;
674674

675675
/* run test */
676676
ret = snd_soc_register_card(&kunit_comp->card);
@@ -715,12 +715,12 @@ static void snd_soc_tplg_test_load_pcm_tplg_reload_comp(struct kunit *test)
715715
kunit_comp->fw.data = data;
716716
kunit_comp->fw.size = size;
717717

718-
kunit_comp->card.dev = test_dev,
719-
kunit_comp->card.name = "kunit-card",
720-
kunit_comp->card.owner = THIS_MODULE,
721-
kunit_comp->card.dai_link = kunit_dai_links,
722-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
723-
kunit_comp->card.fully_routed = true,
718+
kunit_comp->card.dev = test_dev;
719+
kunit_comp->card.name = "kunit-card";
720+
kunit_comp->card.owner = THIS_MODULE;
721+
kunit_comp->card.dai_link = kunit_dai_links;
722+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
723+
kunit_comp->card.fully_routed = true;
724724

725725
/* run test */
726726
ret = snd_soc_register_card(&kunit_comp->card);
@@ -767,12 +767,12 @@ static void snd_soc_tplg_test_load_pcm_tplg_reload_card(struct kunit *test)
767767
kunit_comp->fw.data = data;
768768
kunit_comp->fw.size = size;
769769

770-
kunit_comp->card.dev = test_dev,
771-
kunit_comp->card.name = "kunit-card",
772-
kunit_comp->card.owner = THIS_MODULE,
773-
kunit_comp->card.dai_link = kunit_dai_links,
774-
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
775-
kunit_comp->card.fully_routed = true,
770+
kunit_comp->card.dev = test_dev;
771+
kunit_comp->card.name = "kunit-card";
772+
kunit_comp->card.owner = THIS_MODULE;
773+
kunit_comp->card.dai_link = kunit_dai_links;
774+
kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
775+
kunit_comp->card.fully_routed = true;
776776

777777
/* run test */
778778
ret = snd_soc_component_initialize(&kunit_comp->comp, &test_component, test_dev);

0 commit comments

Comments
 (0)