From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: broonie@kernel.org
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com
Subject: [PATCH] ASoC: cs-amp-lib: Remove redundant calls to kunit_deactivate_static_stub()
Date: Mon, 24 Nov 2025 16:20:16 +0000 [thread overview]
Message-ID: <20251124162016.30446-1-rf@opensource.cirrus.com> (raw)
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
next reply other threads:[~2025-11-24 16:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-24 16:20 Richard Fitzgerald [this message]
2025-11-25 15:38 ` [PATCH] ASoC: cs-amp-lib: Remove redundant calls to kunit_deactivate_static_stub() Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251124162016.30446-1-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.