@@ -244,12 +244,12 @@ static void snd_soc_tplg_test_load_with_null_comp(struct kunit *test)
kunit_comp->kunit = test;
kunit_comp->expect = -EINVAL; /* expect failure */
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->kunit = test;
kunit_comp->expect = 0; /* expect success */
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->kunit = test;
kunit_comp->expect = -EINVAL; /* expect failure */
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
ret = snd_soc_register_card(&kunit_comp->card);
@@ -396,12 +396,12 @@ static void snd_soc_tplg_test_load_empty_tplg(struct kunit *test)
kunit_comp->fw.data = (u8 *)data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->fw.data = (u8 *)data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->fw.data = (u8 *)data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->fw.data = (u8 *)data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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
kunit_comp->fw.data = (u8 *)data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
ret = snd_soc_register_card(&kunit_comp->card);
@@ -665,12 +665,12 @@ static void snd_soc_tplg_test_load_pcm_tplg(struct kunit *test)
kunit_comp->fw.data = data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->fw.data = data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
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)
kunit_comp->fw.data = data;
kunit_comp->fw.size = size;
- kunit_comp->card.dev = test_dev,
- kunit_comp->card.name = "kunit-card",
- kunit_comp->card.owner = THIS_MODULE,
- kunit_comp->card.dai_link = kunit_dai_links,
- kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links),
- kunit_comp->card.fully_routed = true,
+ kunit_comp->card.dev = test_dev;
+ kunit_comp->card.name = "kunit-card";
+ kunit_comp->card.owner = THIS_MODULE;
+ kunit_comp->card.dai_link = kunit_dai_links;
+ kunit_comp->card.num_links = ARRAY_SIZE(kunit_dai_links);
+ kunit_comp->card.fully_routed = true;
/* run test */
ret = snd_soc_component_initialize(&kunit_comp->comp, &test_component, test_dev);
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> --- sound/soc/soc-topology-test.c | 132 +++++++++++++++++----------------- 1 file changed, 66 insertions(+), 66 deletions(-)