| Message ID | 20231205-kunit_bus-v1-4-635036d3bc13@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kunit: Add helpers for creating test-managed devices | expand |
On 12/5/2023 8:31 AM, davidgow@google.com wrote: > Using struct root_device to create fake devices for tests is something > of a hack. The new struct kunit_device is meant for this purpose, so use > it instead. > > Signed-off-by: David Gow <davidgow@google.com> > --- > sound/soc/soc-topology-test.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c > index 2cd3540cec04..1d7696e5bffc 100644 > --- a/sound/soc/soc-topology-test.c > +++ b/sound/soc/soc-topology-test.c > @@ -10,6 +10,7 @@ > #include <sound/soc.h> > #include <sound/soc-topology.h> > #include <kunit/test.h> > +#include <kunit/device.h> Nitpick: Can we add device.h before test.h, to keep it in alphabetical order? > > /* ===== HELPER FUNCTIONS =================================================== */ > > @@ -21,26 +22,20 @@ > */ > static struct device *test_dev; > > -static struct device_driver test_drv = { > - .name = "sound-soc-topology-test-driver", > -}; > - > static int snd_soc_tplg_test_init(struct kunit *test) > { > - test_dev = root_device_register("sound-soc-topology-test"); > + test_dev = kunit_device_register(test, "sound-soc-topology-test"); > test_dev = get_device(test_dev); > if (!test_dev) > return -ENODEV; > > - test_dev->driver = &test_drv; > - > return 0; > } > > static void snd_soc_tplg_test_exit(struct kunit *test) > { > put_device(test_dev); > - root_device_unregister(test_dev); > + kunit_device_unregister(test, test_dev); > } > > /* >
On Tue, Dec 05, 2023 at 03:31:36PM +0800, davidgow@google.com wrote: > Using struct root_device to create fake devices for tests is something > of a hack. The new struct kunit_device is meant for this purpose, so use > it instead. Acked-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index 2cd3540cec04..1d7696e5bffc 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -10,6 +10,7 @@ #include <sound/soc.h> #include <sound/soc-topology.h> #include <kunit/test.h> +#include <kunit/device.h> /* ===== HELPER FUNCTIONS =================================================== */ @@ -21,26 +22,20 @@ */ static struct device *test_dev; -static struct device_driver test_drv = { - .name = "sound-soc-topology-test-driver", -}; - static int snd_soc_tplg_test_init(struct kunit *test) { - test_dev = root_device_register("sound-soc-topology-test"); + test_dev = kunit_device_register(test, "sound-soc-topology-test"); test_dev = get_device(test_dev); if (!test_dev) return -ENODEV; - test_dev->driver = &test_drv; - return 0; } static void snd_soc_tplg_test_exit(struct kunit *test) { put_device(test_dev); - root_device_unregister(test_dev); + kunit_device_unregister(test, test_dev); } /*
Using struct root_device to create fake devices for tests is something of a hack. The new struct kunit_device is meant for this purpose, so use it instead. Signed-off-by: David Gow <davidgow@google.com> --- sound/soc/soc-topology-test.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)