2022-06-01 20:41:37

by Liam Beguin

Subject: [PATCH 1/1] iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m

When IIO_RESCALE_KUNIT_TEST=y and IIO_RESCALE=m,
drivers/iio/afe/iio-rescale.o is built twice causing the
MODULE_LICENSE() to be lost, as shown by:

ERROR: modpost: missing MODULE_LICENSE() in drivers/iio/afe/iio-rescale.o

Rework the build configuration to have the dependency specified in the
Kconfig.

Reported-by: Randy Dunlap <[email protected]>
Fixes: 8e74a48d17d5 ("iio: test: add basic tests for the iio-rescale driver")
Signed-off-by: Liam Beguin <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]>
Reviewed-by: Masahiro Yamada <[email protected]>
---
drivers/iio/test/Kconfig | 2 +-
drivers/iio/test/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/test/Kconfig b/drivers/iio/test/Kconfig
index 56ca0ad7e77a..4c66c3f18c34 100644
--- a/drivers/iio/test/Kconfig
+++ b/drivers/iio/test/Kconfig
@@ -6,7 +6,7 @@
# Keep in alphabetical order
config IIO_RESCALE_KUNIT_TEST
bool "Test IIO rescale conversion functions"
- depends on KUNIT=y && !IIO_RESCALE
+ depends on KUNIT=y && IIO_RESCALE=y
default KUNIT_ALL_TESTS
help
If you want to run tests on the iio-rescale code say Y here.
diff --git a/drivers/iio/test/Makefile b/drivers/iio/test/Makefile
index f15ae0a6394f..880360f8d02c 100644
--- a/drivers/iio/test/Makefile
+++ b/drivers/iio/test/Makefile
@@ -4,6 +4,6 @@
#

# Keep in alphabetical order
-obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o ../afe/iio-rescale.o
+obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o
obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o
CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)
--
2.35.1.4.g5d01301f2b86

2022-06-04 06:36:07

by Jonathan Cameron

Subject: Re: [PATCH 1/1] iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m

On Wed, 1 Jun 2022 10:21:38 -0400
Liam Beguin <[email protected]> wrote:

> When IIO_RESCALE_KUNIT_TEST=y and IIO_RESCALE=m,
> drivers/iio/afe/iio-rescale.o is built twice causing the
> MODULE_LICENSE() to be lost, as shown by:
>
> ERROR: modpost: missing MODULE_LICENSE() in drivers/iio/afe/iio-rescale.o
>
> Rework the build configuration to have the dependency specified in the
> Kconfig.
>
> Reported-by: Randy Dunlap <[email protected]>
> Fixes: 8e74a48d17d5 ("iio: test: add basic tests for the iio-rescale driver")
> Signed-off-by: Liam Beguin <[email protected]>
> Acked-by: Randy Dunlap <[email protected]>
> Tested-by: Randy Dunlap <[email protected]>
> Reviewed-by: Masahiro Yamada <[email protected]>
Applied to the fixes-togreg branch of iio.git.

Thanks all for chasing this down and coming up with a resolution.

Jonathan

> ---
> drivers/iio/test/Kconfig | 2 +-
> drivers/iio/test/Makefile | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/test/Kconfig b/drivers/iio/test/Kconfig
> index 56ca0ad7e77a..4c66c3f18c34 100644
> --- a/drivers/iio/test/Kconfig
> +++ b/drivers/iio/test/Kconfig
> @@ -6,7 +6,7 @@
> # Keep in alphabetical order
> config IIO_RESCALE_KUNIT_TEST
> bool "Test IIO rescale conversion functions"
> - depends on KUNIT=y && !IIO_RESCALE
> + depends on KUNIT=y && IIO_RESCALE=y
> default KUNIT_ALL_TESTS
> help
> If you want to run tests on the iio-rescale code say Y here.
> diff --git a/drivers/iio/test/Makefile b/drivers/iio/test/Makefile
> index f15ae0a6394f..880360f8d02c 100644
> --- a/drivers/iio/test/Makefile
> +++ b/drivers/iio/test/Makefile
> @@ -4,6 +4,6 @@
> #
>
> # Keep in alphabetical order
> -obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o ../afe/iio-rescale.o
> +obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o
> obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o
> CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)