Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: cs-amp-lib: Remove redundant calls to kunit_deactivate_static_stub()

KUnit automatically deactivates stubs when a test case exits, so there
is no need to explicitly call kunit_deactivate_static_stub() in every
test function.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20251124162016.30446-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Richard Fitzgerald and committed by
Mark Brown
a13744f6 7584edf1

-31
-31
sound/soc/codecs/cs-amp-lib-test.c
··· 145 145 146 146 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data); 147 147 KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW); 148 - 149 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 150 148 } 151 149 152 150 /* Redirected get_efi_variable to simulate that the count is larger than the file */ ··· 187 189 188 190 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data); 189 191 KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW); 190 - 191 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 192 192 } 193 193 194 194 /* Redirected get_efi_variable to simulate that the variable not found */ ··· 213 217 214 218 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data); 215 219 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 216 - 217 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 218 220 } 219 221 220 222 /* Redirected get_efi_variable to simulate reading a cal data blob */ ··· 377 383 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, -1, &result_data); 378 384 KUNIT_EXPECT_EQ(test, ret, 0); 379 385 380 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 381 - 382 386 KUNIT_EXPECT_EQ(test, result_data.calTarget[0], target_uid & 0xFFFFFFFFULL); 383 387 KUNIT_EXPECT_EQ(test, result_data.calTarget[1], target_uid >> 32); 384 388 KUNIT_EXPECT_EQ(test, result_data.calTime[0], ··· 410 418 param->amp_index, &result_data); 411 419 KUNIT_EXPECT_EQ(test, ret, 0); 412 420 413 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 414 - 415 421 KUNIT_EXPECT_EQ(test, result_data.calTime[0], 416 422 priv->cal_blob->data[param->amp_index].calTime[0]); 417 423 KUNIT_EXPECT_EQ(test, result_data.calTime[1], ··· 442 452 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, 443 453 param->amp_index, &result_data); 444 454 KUNIT_EXPECT_EQ(test, ret, 0); 445 - 446 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 447 455 448 456 KUNIT_EXPECT_EQ(test, result_data.calTime[0], 449 457 priv->cal_blob->data[param->amp_index].calTime[0]); ··· 479 491 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, 480 492 param->amp_index, &result_data); 481 493 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 482 - 483 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 484 494 } 485 495 486 496 /* ··· 509 523 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, 510 524 param->amp_index, &result_data); 511 525 KUNIT_EXPECT_EQ(test, ret, 0); 512 - 513 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 514 526 515 527 KUNIT_EXPECT_EQ(test, result_data.calTime[0], 516 528 priv->cal_blob->data[param->amp_index].calTime[0]); ··· 549 565 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, -1, 550 566 &result_data); 551 567 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 552 - 553 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 554 568 } 555 569 556 570 /* ··· 578 596 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, 99, 579 597 &result_data); 580 598 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 581 - 582 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 583 599 } 584 600 585 601 /* ··· 599 619 600 620 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 99, &result_data); 601 621 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 602 - 603 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 604 622 } 605 623 606 624 /* If neither the target UID or the index is given the result should be -ENOENT. */ ··· 617 639 618 640 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data); 619 641 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 620 - 621 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 622 642 } 623 643 624 644 /* ··· 644 668 645 669 ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data); 646 670 KUNIT_EXPECT_EQ(test, ret, -ENOENT); 647 - 648 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 649 671 } 650 672 651 673 /* ··· 685 711 0, 2, 686 712 &result_data), 687 713 -ENOENT); 688 - 689 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable); 690 714 } 691 715 692 716 static const struct cirrus_amp_cal_controls cs_amp_lib_test_calibration_controls = { ··· 740 768 741 769 ret = cs_amp_write_cal_coeffs(dsp, &cs_amp_lib_test_calibration_controls, &data); 742 770 KUNIT_EXPECT_EQ(test, ret, 0); 743 - 744 - kunit_deactivate_static_stub(test, cs_amp_test_hooks->write_cal_coeff); 745 - 746 771 KUNIT_EXPECT_EQ(test, list_count_nodes(&priv->ctl_write_list), 4); 747 772 748 773 /* Checksum control must be written last */