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>
---
 sound/soc/codecs/cs-amp-lib-test.c | 31 ------------------------------
 1 file changed, 31 deletions(-)

diff --git a/sound/soc/codecs/cs-amp-lib-test.c b/sound/soc/codecs/cs-amp-lib-test.c
index 7fa6aabc746a..923f1857e45b 100644
--- a/sound/soc/codecs/cs-amp-lib-test.c
+++ b/sound/soc/codecs/cs-amp-lib-test.c
@@ -145,8 +145,6 @@ static void cs_amp_lib_test_cal_data_too_short_test(struct kunit *test)
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /* Redirected get_efi_variable to simulate that the count is larger than the file */
@@ -189,8 +187,6 @@ static void cs_amp_lib_test_cal_count_too_big_test(struct kunit *test)
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /* Redirected get_efi_variable to simulate that the variable not found */
@@ -217,8 +213,6 @@ static void cs_amp_lib_test_no_cal_data_test(struct kunit *test)
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /* Redirected get_efi_variable to simulate reading a cal data blob */
@@ -383,8 +377,6 @@ static void cs_amp_lib_test_get_efi_cal_by_uid_test(struct kunit *test)
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, -1, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
-
 	KUNIT_EXPECT_EQ(test, result_data.calTarget[0], target_uid & 0xFFFFFFFFULL);
 	KUNIT_EXPECT_EQ(test, result_data.calTarget[1], target_uid >> 32);
 	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
@@ -418,8 +410,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_unchecked_test(struct kunit *te
 					      param->amp_index, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
-
 	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
 			      priv->cal_blob->data[param->amp_index].calTime[0]);
 	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -453,8 +443,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_checked_test(struct kunit *test
 					      param->amp_index, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
-
 	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
 			      priv->cal_blob->data[param->amp_index].calTime[0]);
 	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -491,8 +479,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_uid_mismatch_test(struct kunit
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid,
 					      param->amp_index, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /*
@@ -524,8 +510,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_fallback_test(struct kunit *tes
 					      param->amp_index, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
-
 	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
 			      priv->cal_blob->data[param->amp_index].calTime[0]);
 	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -565,8 +549,6 @@ static void cs_amp_lib_test_get_efi_cal_uid_not_found_noindex_test(struct kunit
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, -1,
 					      &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /*
@@ -596,8 +578,6 @@ static void cs_amp_lib_test_get_efi_cal_uid_not_found_index_not_found_test(struc
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, 99,
 					      &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /*
@@ -619,8 +599,6 @@ static void cs_amp_lib_test_get_efi_cal_no_uid_index_not_found_test(struct kunit
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 99, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /* If neither the target UID or the index is given the result should be -ENOENT. */
@@ -639,8 +617,6 @@ static void cs_amp_lib_test_get_efi_cal_no_uid_no_index_test(struct kunit *test)
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /*
@@ -668,8 +644,6 @@ static void cs_amp_lib_test_get_efi_cal_zero_not_matched_test(struct kunit *test
 
 	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);
 	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 /*
@@ -711,8 +685,6 @@ static void cs_amp_lib_test_get_efi_cal_empty_entry_test(struct kunit *test)
 							0, 2,
 							&result_data),
 			-ENOENT);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
 }
 
 static const struct cirrus_amp_cal_controls cs_amp_lib_test_calibration_controls = {
@@ -768,9 +740,6 @@ static void cs_amp_lib_test_write_cal_data_test(struct kunit *test)
 
 	ret = cs_amp_write_cal_coeffs(dsp, &cs_amp_lib_test_calibration_controls, &data);
 	KUNIT_EXPECT_EQ(test, ret, 0);
-
-	kunit_deactivate_static_stub(test, cs_amp_test_hooks->write_cal_coeff);
-
 	KUNIT_EXPECT_EQ(test, list_count_nodes(&priv->ctl_write_list), 4);
 
 	/* Checksum control must be written last */
-- 
2.47.3

On Mon, 24 Nov 2025 16:20:16 +0000, Richard Fitzgerald wrote:
> 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.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs-amp-lib: Remove redundant calls to kunit_deactivate_static_stub()
      commit: a13744f628c61a450f650442a118405242ac0db0

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark